diff --git a/src/intel/compiler/test_opt_cmod_propagation.cpp b/src/intel/compiler/test_opt_cmod_propagation.cpp
index 7e193880905..7c6f08f39ac 100644
--- a/src/intel/compiler/test_opt_cmod_propagation.cpp
+++ b/src/intel/compiler/test_opt_cmod_propagation.cpp
@@ -54,18 +54,6 @@ protected:
                            bool expected_cmod_prop_progress);
 };
 
-class cmod_propagation_fs_visitor : public fs_visitor
-{
-public:
-   cmod_propagation_fs_visitor(struct brw_compiler *compiler,
-                               struct brw_compile_params *params,
-                               struct brw_wm_prog_data *prog_data,
-                               nir_shader *shader)
-      : fs_visitor(compiler, params, NULL,
-                   &prog_data->base, shader, 8, false, false) {}
-};
-
-
 cmod_propagation_test::cmod_propagation_test()
    : bld(NULL, 0)
 {
@@ -81,7 +69,8 @@ cmod_propagation_test::cmod_propagation_test()
    nir_shader *shader =
       nir_shader_create(ctx, MESA_SHADER_FRAGMENT, NULL, NULL);
 
-   v = new cmod_propagation_fs_visitor(compiler, &params, prog_data, shader);
+   v = new fs_visitor(compiler, &params, NULL, &prog_data->base, shader,
+                      8, false, false);
 
    bld = fs_builder(v).at_end();
 
diff --git a/src/intel/compiler/test_opt_copy_propagation.cpp b/src/intel/compiler/test_opt_copy_propagation.cpp
index 9622c694945..cbbf8b48a2d 100644
--- a/src/intel/compiler/test_opt_copy_propagation.cpp
+++ b/src/intel/compiler/test_opt_copy_propagation.cpp
@@ -43,18 +43,6 @@ protected:
    fs_builder bld;
 };
 
-class copy_propagation_fs_visitor : public fs_visitor
-{
-public:
-   copy_propagation_fs_visitor(struct brw_compiler *compiler,
-                               struct brw_compile_params *params,
-                               struct brw_wm_prog_data *prog_data,
-                               nir_shader *shader)
-      : fs_visitor(compiler, params, NULL,
-                   &prog_data->base, shader, 8, false, false) {}
-};
-
-
 copy_propagation_test::copy_propagation_test()
    : bld(NULL, 0)
 {
@@ -70,7 +58,8 @@ copy_propagation_test::copy_propagation_test()
    nir_shader *shader =
       nir_shader_create(ctx, MESA_SHADER_FRAGMENT, NULL, NULL);
 
-   v = new copy_propagation_fs_visitor(compiler, &params, prog_data, shader);
+   v = new fs_visitor(compiler, &params, NULL, &prog_data->base, shader,
+                      8, false, false);
 
    bld = fs_builder(v).at_end();
 
diff --git a/src/intel/compiler/test_opt_cse.cpp b/src/intel/compiler/test_opt_cse.cpp
index 80ce448f052..e826f5cf487 100644
--- a/src/intel/compiler/test_opt_cse.cpp
+++ b/src/intel/compiler/test_opt_cse.cpp
@@ -25,18 +25,6 @@ protected:
    fs_builder bld;
 };
 
-class cse_fs_visitor : public fs_visitor
-{
-public:
-   cse_fs_visitor(struct brw_compiler *compiler,
-                  struct brw_compile_params *params,
-                  struct brw_wm_prog_data *prog_data,
-                  nir_shader *shader)
-      : fs_visitor(compiler, params, NULL,
-                   &prog_data->base, shader, 16, false, false) {}
-};
-
-
 cse_test::cse_test()
    : bld(NULL, 0)
 {
@@ -52,7 +40,8 @@ cse_test::cse_test()
    nir_shader *shader =
       nir_shader_create(ctx, MESA_SHADER_FRAGMENT, NULL, NULL);
 
-   v = new cse_fs_visitor(compiler, &params, prog_data, shader);
+   v = new fs_visitor(compiler, &params, NULL, &prog_data->base, shader,
+                      16, false, false);
 
    bld = fs_builder(v).at_end();
 
diff --git a/src/intel/compiler/test_opt_saturate_propagation.cpp b/src/intel/compiler/test_opt_saturate_propagation.cpp
index 04a98cc9dae..eb7ec734946 100644
--- a/src/intel/compiler/test_opt_saturate_propagation.cpp
+++ b/src/intel/compiler/test_opt_saturate_propagation.cpp
@@ -43,18 +43,6 @@ protected:
    fs_builder bld;
 };
 
-class saturate_propagation_fs_visitor : public fs_visitor
-{
-public:
-   saturate_propagation_fs_visitor(struct brw_compiler *compiler,
-                                   struct brw_compile_params *params,
-                                   struct brw_wm_prog_data *prog_data,
-                                   nir_shader *shader)
-      : fs_visitor(compiler, params, NULL,
-                   &prog_data->base, shader, 16, false, false) {}
-};
-
-
 saturate_propagation_test::saturate_propagation_test()
    : bld(NULL, 0)
 {
@@ -70,7 +58,8 @@ saturate_propagation_test::saturate_propagation_test()
    nir_shader *shader =
       nir_shader_create(ctx, MESA_SHADER_FRAGMENT, NULL, NULL);
 
-   v = new saturate_propagation_fs_visitor(compiler, &params, prog_data, shader);
+   v = new fs_visitor(compiler, &params, NULL, &prog_data->base, shader,
+                      16, false, false);
 
    bld = fs_builder(v).at_end();