diff --git a/devices/test/devices/automatic_polling_performance_test/automatic_polling_performance_test.json b/devices/test/devices/automatic_polling_performance_test/automatic_polling_performance_test.json
new file mode 100644
index 0000000000000000000000000000000000000000..0fa271289f3254df9c61158dd1a94b9884945b09
--- /dev/null
+++ b/devices/test/devices/automatic_polling_performance_test/automatic_polling_performance_test.json
@@ -0,0 +1,20 @@
+{
+    "servers":
+    {
+        "monitoring_performance_test":
+        {
+            "1":
+            {
+                "Monitoring_Performance_Device":
+                {
+                    "test/monitoring_performance/1":
+                    {
+                    },
+                    "test/monitoring_performance/2":
+                    {
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/devices/test/devices/monitoring_performance_test.py b/devices/test/devices/automatic_polling_performance_test/monitoring_performance_test.py
similarity index 100%
rename from devices/test/devices/monitoring_performance_test.py
rename to devices/test/devices/automatic_polling_performance_test/monitoring_performance_test.py