diff --git a/tools/nanobench_flags.json b/tools/nanobench_flags.json
index bdf7cf108d..2eaa3b7268 100644
--- a/tools/nanobench_flags.json
+++ b/tools/nanobench_flags.json
@@ -16,8 +16,6 @@
     "nonrendering", 
     "angle", 
     "hwui", 
-    "srgb", 
-    "f16", 
     "msaa4", 
     "nvprmsaa4", 
     "--match", 
@@ -61,8 +59,6 @@
     "nonrendering", 
     "angle", 
     "hwui", 
-    "srgb", 
-    "f16", 
     "--match", 
     "~blurroundrect", 
     "~patch_grid", 
@@ -103,8 +99,6 @@
     "nonrendering", 
     "angle", 
     "hwui", 
-    "srgb", 
-    "f16", 
     "msaa4", 
     "nvprmsaa4", 
     "--match", 
@@ -148,8 +142,6 @@
     "nonrendering", 
     "angle", 
     "hwui", 
-    "srgb", 
-    "f16", 
     "--match", 
     "~blurroundrect", 
     "~patch_grid", 
@@ -187,8 +179,6 @@
     "nonrendering", 
     "angle", 
     "hwui", 
-    "srgb", 
-    "f16", 
     "msaa16", 
     "nvprmsaa16", 
     "--match", 
@@ -209,8 +199,6 @@
     "nonrendering", 
     "angle", 
     "hwui", 
-    "srgb", 
-    "f16", 
     "msaa16", 
     "nvprmsaa16", 
     "--loops", 
@@ -258,8 +246,6 @@
     "nonrendering", 
     "angle", 
     "hwui", 
-    "srgb", 
-    "f16", 
     "msaa16", 
     "nvprmsaa16", 
     "--GPUbenchTileW", 
@@ -309,8 +295,6 @@
     "nonrendering", 
     "angle", 
     "hwui", 
-    "srgb", 
-    "f16", 
     "msaa16", 
     "nvprmsaa16", 
     "--match", 
diff --git a/tools/nanobench_flags.py b/tools/nanobench_flags.py
index a2ce167a64..451cd5583b 100755
--- a/tools/nanobench_flags.py
+++ b/tools/nanobench_flags.py
@@ -44,7 +44,6 @@ def get_args(bot):
 
   if 'Appurify' not in bot:
     config = ['565', '8888', 'gpu', 'nonrendering', 'angle', 'hwui']
-    config.extend(['srgb', 'f16'])
     # The S4 crashes and the NP produces a long error stream when we run with
     # MSAA.
     if ('GalaxyS4'    not in bot and