diff --git a/ngraph/test/dyn_elimination.cpp b/ngraph/test/dyn_elimination.cpp
index c39d477ffec..f882564fc1f 100644
--- a/ngraph/test/dyn_elimination.cpp
+++ b/ngraph/test/dyn_elimination.cpp
@@ -20,7 +20,7 @@
 #include "ngraph/pass/constant_folding.hpp"
 #include "ngraph/pass/dyn_elimination.hpp"
 #include "ngraph/pass/manager.hpp"
-#include "opset0_downgrade.hpp"
+#include "pass/opset0_downgrade.hpp"
 #include "util/all_close_f.hpp"
 #include "util/test_tools.hpp"
 
diff --git a/ngraph/test/onnx/onnx_import_provenance.in.cpp b/ngraph/test/onnx/onnx_import_provenance.in.cpp
index 473d1188b25..20d76b179be 100644
--- a/ngraph/test/onnx/onnx_import_provenance.in.cpp
+++ b/ngraph/test/onnx/onnx_import_provenance.in.cpp
@@ -21,8 +21,8 @@
 #include "onnx_import/default_opset.hpp"
 #include "onnx_import/onnx.hpp"
 #include "opset0.hpp"
-#include "opset0_downgrade.hpp"
-#include "opset1_downgrade.hpp"
+#include "pass/opset0_downgrade.hpp"
+#include "pass/opset1_downgrade.hpp"
 #include "util/provenance_enabler.hpp"
 #include "util/test_control.hpp"
 #include "util/type_prop.hpp"
diff --git a/ngraph/test/provenance.cpp b/ngraph/test/provenance.cpp
index 718f3ca3011..b814b16ba37 100644
--- a/ngraph/test/provenance.cpp
+++ b/ngraph/test/provenance.cpp
@@ -27,9 +27,9 @@
 #include "ngraph/ngraph.hpp"
 #include "ngraph/pass/manager.hpp"
 #include "ngraph/provenance.hpp"
-#include "opset0_downgrade.hpp"
-#include "opset1_upgrade.hpp"
 #include "pass/fused_op_decomposition.hpp"
+#include "pass/opset0_downgrade.hpp"
+#include "pass/opset1_upgrade.hpp"
 #include "util/provenance_enabler.hpp"
 
 using namespace std;
diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt
index 7f9d22d30e4..152f297520e 100644
--- a/ngraph/test/runtime/CMakeLists.txt
+++ b/ngraph/test/runtime/CMakeLists.txt
@@ -20,12 +20,6 @@ set (SRC
     backend_manager.hpp
     cache.cpp
     cache.hpp
-    opset0_downgrade.cpp
-    opset0_downgrade.hpp
-    opset1_downgrade.cpp
-    opset1_downgrade.hpp
-    opset1_upgrade.cpp
-    opset1_upgrade.hpp
     executable.cpp
     executable.hpp
     performance_counter.hpp
@@ -47,6 +41,12 @@ set (SRC
     pass/like_replacement.hpp
     pass/liveness.cpp
     pass/liveness.hpp
+    pass/opset0_downgrade.cpp
+    pass/opset0_downgrade.hpp
+    pass/opset1_downgrade.cpp
+    pass/opset1_downgrade.hpp
+    pass/opset1_upgrade.cpp
+    pass/opset1_upgrade.hpp
     pass/shape_relevance.cpp
     pass/shape_relevance.hpp
     )
diff --git a/ngraph/test/runtime/dynamic/dynamic_backend.cpp b/ngraph/test/runtime/dynamic/dynamic_backend.cpp
index 85edda65a02..94483717e12 100644
--- a/ngraph/test/runtime/dynamic/dynamic_backend.cpp
+++ b/ngraph/test/runtime/dynamic/dynamic_backend.cpp
@@ -26,9 +26,9 @@
 #include "ngraph/pass/manager.hpp"
 #include "ngraph/specialize_function.hpp"
 #include "ngraph/util.hpp"
-#include "opset0_downgrade.hpp"
-#include "opset1_downgrade.hpp"
 #include "pass/dyn_elimination.hpp"
+#include "pass/opset0_downgrade.hpp"
+#include "pass/opset1_downgrade.hpp"
 #include "pass/shape_relevance.hpp"
 
 using namespace std;
diff --git a/ngraph/test/runtime/ie/ie_executable.cpp b/ngraph/test/runtime/ie/ie_executable.cpp
index bd930764d77..85bae0711c0 100644
--- a/ngraph/test/runtime/ie/ie_executable.cpp
+++ b/ngraph/test/runtime/ie/ie_executable.cpp
@@ -21,7 +21,7 @@
 #include "ngraph/pass/manager.hpp"
 #include "ngraph/shape.hpp"
 #include "ngraph/type/element_type.hpp"
-#include "opset1_upgrade.hpp"
+#include "pass/opset1_upgrade.hpp"
 
 using namespace std;
 using namespace ngraph;
diff --git a/ngraph/test/runtime/interpreter/int_executable.cpp b/ngraph/test/runtime/interpreter/int_executable.cpp
index 99d27b8aaf0..34c300c1a59 100644
--- a/ngraph/test/runtime/interpreter/int_executable.cpp
+++ b/ngraph/test/runtime/interpreter/int_executable.cpp
@@ -24,11 +24,11 @@
 #include "ngraph/ops.hpp"
 #include "ngraph/pass/manager.hpp"
 #include "ngraph/util.hpp"
-#include "opset0_downgrade.hpp"
-#include "opset1_downgrade.hpp"
 #include "pass/fused_op_decomposition.hpp"
 #include "pass/like_replacement.hpp"
 #include "pass/liveness.hpp"
+#include "pass/opset0_downgrade.hpp"
+#include "pass/opset1_downgrade.hpp"
 
 using namespace std;
 using namespace ngraph;
diff --git a/ngraph/test/runtime/opset0_downgrade.cpp b/ngraph/test/runtime/pass/opset0_downgrade.cpp
similarity index 99%
rename from ngraph/test/runtime/opset0_downgrade.cpp
rename to ngraph/test/runtime/pass/opset0_downgrade.cpp
index d7e70ec3c5c..7ecc7b5a92b 100644
--- a/ngraph/test/runtime/opset0_downgrade.cpp
+++ b/ngraph/test/runtime/pass/opset0_downgrade.cpp
@@ -33,8 +33,8 @@
 #include "op/avg_pool.hpp"
 #include "op/convolution.hpp"
 #include "op/group_conv.hpp"
-#include "opset0_downgrade.hpp"
 #include "pass/implicit_broadcast_elimination.hpp"
+#include "pass/opset0_downgrade.hpp"
 
 using namespace std;
 using namespace ngraph;
diff --git a/ngraph/test/runtime/opset0_downgrade.hpp b/ngraph/test/runtime/pass/opset0_downgrade.hpp
similarity index 100%
rename from ngraph/test/runtime/opset0_downgrade.hpp
rename to ngraph/test/runtime/pass/opset0_downgrade.hpp
diff --git a/ngraph/test/runtime/opset1_downgrade.cpp b/ngraph/test/runtime/pass/opset1_downgrade.cpp
similarity index 100%
rename from ngraph/test/runtime/opset1_downgrade.cpp
rename to ngraph/test/runtime/pass/opset1_downgrade.cpp
diff --git a/ngraph/test/runtime/opset1_downgrade.hpp b/ngraph/test/runtime/pass/opset1_downgrade.hpp
similarity index 100%
rename from ngraph/test/runtime/opset1_downgrade.hpp
rename to ngraph/test/runtime/pass/opset1_downgrade.hpp
diff --git a/ngraph/test/runtime/opset1_upgrade.cpp b/ngraph/test/runtime/pass/opset1_upgrade.cpp
similarity index 100%
rename from ngraph/test/runtime/opset1_upgrade.cpp
rename to ngraph/test/runtime/pass/opset1_upgrade.cpp
diff --git a/ngraph/test/runtime/opset1_upgrade.hpp b/ngraph/test/runtime/pass/opset1_upgrade.hpp
similarity index 100%
rename from ngraph/test/runtime/opset1_upgrade.hpp
rename to ngraph/test/runtime/pass/opset1_upgrade.hpp
diff --git a/ngraph/test/util/engine/ie_engines.cpp b/ngraph/test/util/engine/ie_engines.cpp
index 38c027f672d..788766b95df 100644
--- a/ngraph/test/util/engine/ie_engines.cpp
+++ b/ngraph/test/util/engine/ie_engines.cpp
@@ -19,7 +19,7 @@
 #include "ngraph/op/get_output_element.hpp"
 #include "ngraph/opsets/opset.hpp"
 #include "ngraph/pass/manager.hpp"
-#include "opset1_upgrade.hpp"
+#include "pass/opset1_upgrade.hpp"
 
 using namespace ngraph;