diff --git a/tests/itests/docutests/build_md_test.py b/tests/itests/docutests/build_md_test.py
index cdaeb3f..d887075 100644
--- a/tests/itests/docutests/build_md_test.py
+++ b/tests/itests/docutests/build_md_test.py
@@ -736,7 +736,7 @@
             "(.*)consul_1(.*)agent: Synced service(.*)kafka(.*):9092"
         ]
         pattern_found = []
-        max_wait_time = 120  # wait 2 mins as a maximum
+        max_wait_time = 60  # wait 2 mins as a maximum
 
         def _stop_process(proc):
             try:
diff --git a/tests/itests/frameio_tests/__init__.py b/tests/itests/frameio_tests/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/tests/itests/frameio_tests/__init__.py
+++ /dev/null
diff --git a/tests/itests/frameio_tests/run_as_root/__init__.py b/tests/itests/run_as_root/__init__.py
similarity index 100%
rename from tests/itests/frameio_tests/run_as_root/__init__.py
rename to tests/itests/run_as_root/__init__.py
diff --git a/tests/itests/frameio_tests/run_as_root/test_frameio.py b/tests/itests/run_as_root/test_frameio.py
similarity index 100%
rename from tests/itests/frameio_tests/run_as_root/test_frameio.py
rename to tests/itests/run_as_root/test_frameio.py