diff --git a/tests/ino2cpp/__init__.py b/tests/misc/__init__.py
similarity index 100%
rename from tests/ino2cpp/__init__.py
rename to tests/misc/__init__.py
diff --git a/tests/misc/ino2cpp/__init__.py b/tests/misc/ino2cpp/__init__.py
new file mode 100644
index 00000000..b0514903
--- /dev/null
+++ b/tests/misc/ino2cpp/__init__.py
@@ -0,0 +1,13 @@
+# Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/ino2cpp/basic/basic.ino b/tests/misc/ino2cpp/examples/basic/basic.ino
similarity index 100%
rename from tests/ino2cpp/basic/basic.ino
rename to tests/misc/ino2cpp/examples/basic/basic.ino
diff --git a/tests/ino2cpp/multifiles/bar.ino b/tests/misc/ino2cpp/examples/multifiles/bar.ino
similarity index 100%
rename from tests/ino2cpp/multifiles/bar.ino
rename to tests/misc/ino2cpp/examples/multifiles/bar.ino
diff --git a/tests/ino2cpp/multifiles/foo.pde b/tests/misc/ino2cpp/examples/multifiles/foo.pde
similarity index 100%
rename from tests/ino2cpp/multifiles/foo.pde
rename to tests/misc/ino2cpp/examples/multifiles/foo.pde
diff --git a/tests/ino2cpp/strmultilines/main.ino b/tests/misc/ino2cpp/examples/strmultilines/main.ino
similarity index 100%
rename from tests/ino2cpp/strmultilines/main.ino
rename to tests/misc/ino2cpp/examples/strmultilines/main.ino
diff --git a/tests/test_ino2cpp.py b/tests/misc/ino2cpp/test_ino2cpp.py
similarity index 79%
rename from tests/test_ino2cpp.py
rename to tests/misc/ino2cpp/test_ino2cpp.py
index d1434df7..9c997822 100644
--- a/tests/test_ino2cpp.py
+++ b/tests/misc/ino2cpp/test_ino2cpp.py
@@ -17,16 +17,16 @@ from os.path import dirname, isdir, join, normpath
 
 from platformio.commands.ci import cli as cmd_ci
 
-INOTEST_DIR = normpath(join(dirname(__file__), "ino2cpp"))
+EXAMPLES_DIR = normpath(join(dirname(__file__), "examples"))
 
 
 def pytest_generate_tests(metafunc):
     if "piotest_dir" not in metafunc.fixturenames:
         return
     test_dirs = []
-    for name in listdir(INOTEST_DIR):
-        if isdir(join(INOTEST_DIR, name)):
-            test_dirs.append(join(INOTEST_DIR, name))
+    for name in listdir(EXAMPLES_DIR):
+        if isdir(join(EXAMPLES_DIR, name)):
+            test_dirs.append(join(EXAMPLES_DIR, name))
     test_dirs.sort()
     metafunc.parametrize("piotest_dir", test_dirs)
 
@@ -37,10 +37,10 @@ def test_example(clirunner, validate_cliresult, piotest_dir):
 
 
 def test_warning_line(clirunner, validate_cliresult):
-    result = clirunner.invoke(cmd_ci, [join(INOTEST_DIR, "basic"), "-b", "uno"])
+    result = clirunner.invoke(cmd_ci, [join(EXAMPLES_DIR, "basic"), "-b", "uno"])
     validate_cliresult(result)
     assert 'basic.ino:16:14: warning: #warning "Line number is 16"' in result.output
     assert 'basic.ino:46:2: warning: #warning "Line number is 46"' in result.output
-    result = clirunner.invoke(cmd_ci, [join(INOTEST_DIR, "strmultilines"), "-b", "uno"])
+    result = clirunner.invoke(cmd_ci, [join(EXAMPLES_DIR, "strmultilines"), "-b", "uno"])
     validate_cliresult(result)
     assert 'main.ino:75:2: warning: #warning "Line 75"' in result.output
diff --git a/tests/test_maintenance.py b/tests/misc/test_maintenance.py
similarity index 100%
rename from tests/test_maintenance.py
rename to tests/misc/test_maintenance.py
diff --git a/tests/test_misc.py b/tests/misc/test_misc.py
similarity index 100%
rename from tests/test_misc.py
rename to tests/misc/test_misc.py