diff --git a/conans/test/__init__.py b/conan/test/__init__.py
similarity index 100%
rename from conans/test/__init__.py
rename to conan/test/__init__.py
diff --git a/conans/test/assets/__init__.py b/conan/test/assets/__init__.py
similarity index 100%
rename from conans/test/assets/__init__.py
rename to conan/test/assets/__init__.py
diff --git a/conans/test/assets/autotools.py b/conan/test/assets/autotools.py
similarity index 100%
rename from conans/test/assets/autotools.py
rename to conan/test/assets/autotools.py
diff --git a/conans/test/assets/cmake.py b/conan/test/assets/cmake.py
similarity index 100%
rename from conans/test/assets/cmake.py
rename to conan/test/assets/cmake.py
diff --git a/conans/test/assets/genconanfile.py b/conan/test/assets/genconanfile.py
similarity index 100%
rename from conans/test/assets/genconanfile.py
rename to conan/test/assets/genconanfile.py
diff --git a/conans/test/assets/pkg_cmake.py b/conan/test/assets/pkg_cmake.py
similarity index 100%
rename from conans/test/assets/pkg_cmake.py
rename to conan/test/assets/pkg_cmake.py
diff --git a/conans/test/assets/sources.py b/conan/test/assets/sources.py
similarity index 100%
rename from conans/test/assets/sources.py
rename to conan/test/assets/sources.py
diff --git a/conans/test/assets/visual_project_files.py b/conan/test/assets/visual_project_files.py
similarity index 100%
rename from conans/test/assets/visual_project_files.py
rename to conan/test/assets/visual_project_files.py
diff --git a/conans/test/functional/__init__.py b/conan/test/utils/__init__.py
similarity index 100%
rename from conans/test/functional/__init__.py
rename to conan/test/utils/__init__.py
diff --git a/conans/test/utils/artifactory.py b/conan/test/utils/artifactory.py
similarity index 100%
rename from conans/test/utils/artifactory.py
rename to conan/test/utils/artifactory.py
diff --git a/conans/test/utils/file_server.py b/conan/test/utils/file_server.py
similarity index 100%
rename from conans/test/utils/file_server.py
rename to conan/test/utils/file_server.py
diff --git a/conans/test/utils/mocks.py b/conan/test/utils/mocks.py
similarity index 100%
rename from conans/test/utils/mocks.py
rename to conan/test/utils/mocks.py
diff --git a/conans/test/utils/profiles.py b/conan/test/utils/profiles.py
similarity index 100%
rename from conans/test/utils/profiles.py
rename to conan/test/utils/profiles.py
diff --git a/conans/test/utils/scm.py b/conan/test/utils/scm.py
similarity index 100%
rename from conans/test/utils/scm.py
rename to conan/test/utils/scm.py
diff --git a/conans/test/utils/server_launcher.py b/conan/test/utils/server_launcher.py
similarity index 100%
rename from conans/test/utils/server_launcher.py
rename to conan/test/utils/server_launcher.py
diff --git a/conans/test/utils/test_files.py b/conan/test/utils/test_files.py
similarity index 100%
rename from conans/test/utils/test_files.py
rename to conan/test/utils/test_files.py
diff --git a/conans/test/utils/tools.py b/conan/test/utils/tools.py
similarity index 100%
rename from conans/test/utils/tools.py
rename to conan/test/utils/tools.py
diff --git a/conans/test/unittests/client/build/compiler_flags_test.py b/conans/test/unittests/client/build/compiler_flags_test.py
deleted file mode 100644
index 9e8f64d8a9e..00000000000
--- a/conans/test/unittests/client/build/compiler_flags_test.py
+++ /dev/null
@@ -1,106 +0,0 @@
-import unittest
-from parameterized.parameterized import parameterized
-
-from conan.tools.build.flags import architecture_flag, build_type_flags
-from conans.test.utils.mocks import MockSettings
-
-
-class CompilerFlagsTest(unittest.TestCase):
-
-    @parameterized.expand([("gcc", "x86", None, "-m32"),
-                           ("clang", "x86", None, "-m32"),
-                           ("sun-cc", "x86", None, "-m32"),
-                           ("gcc", "x86_64", None, "-m64"),
-                           ("clang", "x86_64", None, "-m64"),
-                           ("sun-cc", "x86_64", None, "-m64"),
-                           ("sun-cc", "sparc", None, "-m32"),
-                           ("sun-cc", "sparcv9", None, "-m64"),
-                           ("gcc", "armv7", None, ""),
-                           ("clang", "armv7", None, ""),
-                           ("sun-cc", "armv7", None, ""),
-                           ("gcc", "s390", None, "-m31"),
-                           ("clang", "s390", None, "-m31"),
-                           ("sun-cc", "s390", None, "-m31"),
-                           ("gcc", "s390x", None, "-m64"),
-                           ("clang", "s390x", None, "-m64"),
-                           ("sun-cc", "s390x", None, "-m64"),
-                           ("msvc", "x86", None, ""),
-                           ("msvc", "x86_64", None, ""),
-                           ("gcc", "ppc32", "AIX", "-maix32"),
-                           ("gcc", "ppc64", "AIX", "-maix64"),
-                           ])
-    def test_arch_flag(self, compiler, arch, the_os, flag):
-        settings = MockSettings({"compiler": compiler,
-                                 "arch": arch,
-                                 "os": the_os})
-        self.assertEqual(architecture_flag(settings), flag)
-
-    def test_catalyst(self):
-        settings = MockSettings({"compiler": "apple-clang",
-                                 "arch": "x86_64",
-                                 "os": "Macos",
-                                 "os.subsystem": "catalyst",
-                                 "os.subsystem.ios_version": "13.1"})
-        self.assertEqual(architecture_flag(settings), "--target=x86_64-apple-ios13.1-macabi")
-
-        settings = MockSettings({"compiler": "apple-clang",
-                                 "arch": "armv8",
-                                 "os": "Macos",
-                                 "os.subsystem": "catalyst",
-                                 "os.subsystem.ios_version": "13.1"})
-        self.assertEqual(architecture_flag(settings), "--target=arm64-apple-ios13.1-macabi")
-
-    @parameterized.expand([("Linux", "x86", "-m32"),
-                           ("Linux", "x86_64", "-m64"),
-                           ("Windows", "x86", "/Qm32"),
-                           ("Windows", "x86_64", "/Qm64"),
-                           ])
-    def test_arch_flag_intel(self, os_, arch, flag):
-        settings = MockSettings({"compiler": "intel-cc",
-                                 "os": os_,
-                                 "arch": arch})
-        self.assertEqual(architecture_flag(settings), flag)
-
-    @parameterized.expand([("e2k-v2", "-march=elbrus-v2"),
-                           ("e2k-v3", "-march=elbrus-v3"),
-                           ("e2k-v4", "-march=elbrus-v4"),
-                           ("e2k-v5", "-march=elbrus-v5"),
-                           ("e2k-v6", "-march=elbrus-v6"),
-                           ("e2k-v7", "-march=elbrus-v7"),
-                           ])
-    def test_arch_flag_mcst_lcc(self, arch, flag):
-        settings = MockSettings({"compiler": "mcst-lcc",
-                                 "arch": arch})
-        self.assertEqual(architecture_flag(settings), flag)
-
-    @parameterized.expand([("msvc", "Debug", None, "-Zi -Ob0 -Od"),
-                           ("msvc", "Release", None, "-O2 -Ob2"),
-                           ("msvc", "RelWithDebInfo", None, "-Zi -O2 -Ob1"),
-                           ("msvc", "MinSizeRel", None, "-O1 -Ob1"),
-                           ("msvc", "Debug", "v140_clang_c2", "-gline-tables-only -fno-inline -O0"),
-                           ("msvc", "Release", "v140_clang_c2", "-O2"),
-                           ("msvc", "RelWithDebInfo", "v140_clang_c2", "-gline-tables-only -O2 -fno-inline"),
-                           ("msvc", "MinSizeRel", "v140_clang_c2", ""),
-                           ("gcc", "Debug", None, "-g"),
-                           ("gcc", "Release", None, "-O3"),
-                           ("gcc", "RelWithDebInfo", None, "-O2 -g"),
-                           ("gcc", "MinSizeRel", None, "-Os"),
-                           ("clang", "Debug", None, "-g"),
-                           ("clang", "Release", None, "-O3"),
-                           ("clang", "RelWithDebInfo", None, "-O2 -g"),
-                           ("clang", "MinSizeRel", None, "-Os"),
-                           ("apple-clang", "Debug", None, "-g"),
-                           ("apple-clang", "Release", None, "-O3"),
-                           ("apple-clang", "RelWithDebInfo", None, "-O2 -g"),
-                           ("apple-clang", "MinSizeRel", None, "-Os"),
-                           ("sun-cc", "Debug", None, "-g"),
-                           ("sun-cc", "Release", None, "-xO3"),
-                           ("sun-cc", "RelWithDebInfo", None, "-xO2 -g"),
-                           ("sun-cc", "MinSizeRel", None, "-xO2 -xspace"),
-                           ])
-    def test_build_type_flags(self, compiler, build_type, vs_toolset, flags):
-        settings = MockSettings({"compiler": compiler,
-                                 "build_type": build_type,
-                                 "compiler.toolset": vs_toolset})
-        self.assertEqual(' '.join(build_type_flags(settings)),
-                         flags)
diff --git a/conans/test/unittests/client/build/cpp_std_flags_test.py b/conans/test/unittests/client/build/cpp_std_flags_test.py
deleted file mode 100644
index f9b6cc373bf..00000000000
--- a/conans/test/unittests/client/build/cpp_std_flags_test.py
+++ /dev/null
@@ -1,331 +0,0 @@
-import unittest
-
-from conan.internal.api.detect_api import default_cppstd
-from conan.tools.build import cppstd_flag
-from conans.model.version import Version
-from conans.test.utils.mocks import MockSettings, ConanFileMock
-
-
-def _make_cppstd_flag(compiler, compiler_version, cppstd=None):
-    conanfile = ConanFileMock()
-    conanfile.settings = MockSettings({"compiler": compiler,
-                             "compiler.version": compiler_version,
-                             "compiler.cppstd": cppstd})
-    return cppstd_flag(conanfile)
-
-
-def _make_cppstd_default(compiler, compiler_version):
-    return default_cppstd(compiler, Version(compiler_version))
-
-
-class CompilerFlagsTest(unittest.TestCase):
-
-    def test_gcc_cppstd_flags(self):
-        self.assertEqual(_make_cppstd_flag("gcc", "4.2", "98"), "-std=c++98")
-        self.assertEqual(_make_cppstd_flag("gcc", "4.2", "gnu98"), "-std=gnu++98")
-        self.assertEqual(_make_cppstd_flag("gcc", "4.2", "11"), None)
-        self.assertEqual(_make_cppstd_flag("gcc", "4.2", "14"), None)
-
-        self.assertEqual(_make_cppstd_flag("gcc", "4.3", "98"), "-std=c++98")
-        self.assertEqual(_make_cppstd_flag("gcc", "4.3", "gnu98"), "-std=gnu++98")
-        self.assertEqual(_make_cppstd_flag("gcc", "4.3", "11"), "-std=c++0x")
-        self.assertEqual(_make_cppstd_flag("gcc", "4.3", "14"), None)
-
-        self.assertEqual(_make_cppstd_flag("gcc", "4.6", "11"), '-std=c++0x')
-        self.assertEqual(_make_cppstd_flag("gcc", "4.6", "14"), None)
-
-        self.assertEqual(_make_cppstd_flag("gcc", "4.7", "11"), '-std=c++11')
-        self.assertEqual(_make_cppstd_flag("gcc", "4.7", "14"), None)
-
-        self.assertEqual(_make_cppstd_flag("gcc", "4.8", "11"), '-std=c++11')
-        self.assertEqual(_make_cppstd_flag("gcc", "4.8", "14"), '-std=c++1y')
-        self.assertEqual(_make_cppstd_flag("gcc", "4.8", "17"), None)
-
-        self.assertEqual(_make_cppstd_flag("gcc", "4.9", "11"), '-std=c++11')
-        self.assertEqual(_make_cppstd_flag("gcc", "4.9", "14"), '-std=c++14')
-        self.assertEqual(_make_cppstd_flag("gcc", "4.9", "17"), None)
-
-        self.assertEqual(_make_cppstd_flag("gcc", "5", "11"), '-std=c++11')
-        self.assertEqual(_make_cppstd_flag("gcc", "5", "14"), '-std=c++14')
-        self.assertEqual(_make_cppstd_flag("gcc", "5", "gnu14"), '-std=gnu++14')
-        self.assertEqual(_make_cppstd_flag("gcc", "5", "17"), '-std=c++1z')
-        self.assertEqual(_make_cppstd_flag("gcc", "5", "gnu17"), '-std=gnu++1z')
-
-        self.assertEqual(_make_cppstd_flag("gcc", "5.1", "11"), '-std=c++11')
-        self.assertEqual(_make_cppstd_flag("gcc", "5.1", "14"), '-std=c++14')
-        self.assertEqual(_make_cppstd_flag("gcc", "5.1", "17"), '-std=c++1z')
-
-        self.assertEqual(_make_cppstd_flag("gcc", "7", "11"), '-std=c++11')
-        self.assertEqual(_make_cppstd_flag("gcc", "7", "14"), '-std=c++14')
-        self.assertEqual(_make_cppstd_flag("gcc", "7", "17"), '-std=c++17')
-
-        self.assertEqual(_make_cppstd_flag("gcc", "8", "11"), '-std=c++11')
-        self.assertEqual(_make_cppstd_flag("gcc", "8", "14"), '-std=c++14')
-        self.assertEqual(_make_cppstd_flag("gcc", "8", "17"), '-std=c++17')
-        self.assertEqual(_make_cppstd_flag("gcc", "8", "20"), '-std=c++2a')
-        self.assertEqual(_make_cppstd_flag("gcc", "8", "23"), None)
-
-        self.assertEqual(_make_cppstd_flag("gcc", "11", "11"), '-std=c++11')
-        self.assertEqual(_make_cppstd_flag("gcc", "11", "14"), '-std=c++14')
-        self.assertEqual(_make_cppstd_flag("gcc", "11", "17"), '-std=c++17')
-        self.assertEqual(_make_cppstd_flag("gcc", "11", "20"), '-std=c++2a')
-        self.assertEqual(_make_cppstd_flag("gcc", "11", "23"), '-std=c++2b')
-
-    def test_gcc_cppstd_defaults(self):
-        self.assertEqual(_make_cppstd_default("gcc", "4"), "gnu98")
-        self.assertEqual(_make_cppstd_default("gcc", "5"), "gnu98")
-        self.assertEqual(_make_cppstd_default("gcc", "6"), "gnu14")
-        self.assertEqual(_make_cppstd_default("gcc", "6.1"), "gnu14")
-        self.assertEqual(_make_cppstd_default("gcc", "7.3"), "gnu14")
-        self.assertEqual(_make_cppstd_default("gcc", "8.1"), "gnu14")
-        self.assertEqual(_make_cppstd_default("gcc", "11"), "gnu17")
-        self.assertEqual(_make_cppstd_default("gcc", "11.1"), "gnu17")
-
-    def test_clang_cppstd_flags(self):
-        self.assertEqual(_make_cppstd_flag("clang", "2.0", "98"), None)
-        self.assertEqual(_make_cppstd_flag("clang", "2.0", "gnu98"), None)
-        self.assertEqual(_make_cppstd_flag("clang", "2.0", "11"), None)
-        self.assertEqual(_make_cppstd_flag("clang", "2.0", "14"), None)
-
-        self.assertEqual(_make_cppstd_flag("clang", "2.1", "98"), "-std=c++98")
-        self.assertEqual(_make_cppstd_flag("clang", "2.1", "gnu98"), "-std=gnu++98")
-        self.assertEqual(_make_cppstd_flag("clang", "2.1", "11"), "-std=c++0x")
-        self.assertEqual(_make_cppstd_flag("clang", "2.1", "14"), None)
-
-        self.assertEqual(_make_cppstd_flag("clang", "3.0", "11"), '-std=c++0x')
-        self.assertEqual(_make_cppstd_flag("clang", "3.0", "14"), None)
-
-        self.assertEqual(_make_cppstd_flag("clang", "3.1", "11"), '-std=c++11')
-        self.assertEqual(_make_cppstd_flag("clang", "3.1", "14"), None)
-
-        self.assertEqual(_make_cppstd_flag("clang", "3.4", "11"), '-std=c++11')
-        self.assertEqual(_make_cppstd_flag("clang", "3.4", "14"), '-std=c++1y')
-        self.assertEqual(_make_cppstd_flag("clang", "3.4", "17"), None)
-
-        self.assertEqual(_make_cppstd_flag("clang", "3.5", "11"), '-std=c++11')
-        self.assertEqual(_make_cppstd_flag("clang", "3.5", "14"), '-std=c++14')
-        self.assertEqual(_make_cppstd_flag("clang", "3.5", "17"), '-std=c++1z')
-
-        self.assertEqual(_make_cppstd_flag("clang", "5", "11"), '-std=c++11')
-        self.assertEqual(_make_cppstd_flag("clang", "5", "14"), '-std=c++14')
-        self.assertEqual(_make_cppstd_flag("clang", "5", "gnu14"), '-std=gnu++14')
-        self.assertEqual(_make_cppstd_flag("clang", "5", "17"), '-std=c++17')
-
-        self.assertEqual(_make_cppstd_flag("clang", "5.1", "11"), '-std=c++11')
-        self.assertEqual(_make_cppstd_flag("clang", "5.1", "14"), '-std=c++14')
-        self.assertEqual(_make_cppstd_flag("clang", "5.1", "17"), '-std=c++17')
-
-        for version in ["6", "7", "8", "9", "10", "11"]:
-            self.assertEqual(_make_cppstd_flag("clang", version, "11"), '-std=c++11')
-            self.assertEqual(_make_cppstd_flag("clang", version, "14"), '-std=c++14')
-            self.assertEqual(_make_cppstd_flag("clang", version, "17"), '-std=c++17')
-            self.assertEqual(_make_cppstd_flag("clang", version, "20"), '-std=c++2a')
-
-        self.assertEqual(_make_cppstd_flag("clang", "12", "11"), '-std=c++11')
-        self.assertEqual(_make_cppstd_flag("clang", "12", "14"), '-std=c++14')
-        self.assertEqual(_make_cppstd_flag("clang", "12", "17"), '-std=c++17')
-        self.assertEqual(_make_cppstd_flag("clang", "12", "20"), '-std=c++20')
-        self.assertEqual(_make_cppstd_flag("clang", "12", "23"), '-std=c++2b')
-
-        self.assertEqual(_make_cppstd_flag("clang", "17", "11"), '-std=c++11')
-        self.assertEqual(_make_cppstd_flag("clang", "17", "14"), '-std=c++14')
-        self.assertEqual(_make_cppstd_flag("clang", "17", "17"), '-std=c++17')
-        self.assertEqual(_make_cppstd_flag("clang", "17", "20"), '-std=c++20')
-        self.assertEqual(_make_cppstd_flag("clang", "17", "23"), '-std=c++23')
-
-    def test_clang_cppstd_defaults(self):
-        self.assertEqual(_make_cppstd_default("clang", "2"), "gnu98")
-        self.assertEqual(_make_cppstd_default("clang", "2.1"), "gnu98")
-        self.assertEqual(_make_cppstd_default("clang", "3.0"), "gnu98")
-        self.assertEqual(_make_cppstd_default("clang", "3.1"), "gnu98")
-        self.assertEqual(_make_cppstd_default("clang", "3.4"), "gnu98")
-        self.assertEqual(_make_cppstd_default("clang", "3.5"), "gnu98")
-        self.assertEqual(_make_cppstd_default("clang", "5"), "gnu98")
-        self.assertEqual(_make_cppstd_default("clang", "5.1"), "gnu98")
-        self.assertEqual(_make_cppstd_default("clang", "6"), "gnu14")
-        self.assertEqual(_make_cppstd_default("clang", "7"), "gnu14")
-        self.assertEqual(_make_cppstd_default("clang", "8"), "gnu14")
-        self.assertEqual(_make_cppstd_default("clang", "9"), "gnu14")
-        self.assertEqual(_make_cppstd_default("clang", "10"), "gnu14")
-        self.assertEqual(_make_cppstd_default("clang", "11"), "gnu14")
-        self.assertEqual(_make_cppstd_default("clang", "12"), "gnu14")
-        self.assertEqual(_make_cppstd_default("clang", "13"), "gnu14")
-        self.assertEqual(_make_cppstd_default("clang", "14"), "gnu14")
-        self.assertEqual(_make_cppstd_default("clang", "15"), "gnu14")
-        self.assertEqual(_make_cppstd_default("clang", "16"), "gnu17")
-
-    def test_apple_clang_cppstd_flags(self):
-        self.assertEqual(_make_cppstd_flag("apple-clang", "3.9", "98"), None)
-        self.assertEqual(_make_cppstd_flag("apple-clang", "3.9", "gnu98"), None)
-        self.assertEqual(_make_cppstd_flag("apple-clang", "3.9", "11"), None)
-        self.assertEqual(_make_cppstd_flag("apple-clang", "3.9", "14"), None)
-
-        self.assertEqual(_make_cppstd_flag("apple-clang", "4.0", "98"), "-std=c++98")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "4.0", "gnu98"), "-std=gnu++98")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "4.0", "11"), "-std=c++11")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "4.0", "14"), None)
-
-        self.assertEqual(_make_cppstd_flag("apple-clang", "5.0", "98"), "-std=c++98")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "5.0", "gnu98"), "-std=gnu++98")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "5.0", "11"), "-std=c++11")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "5.0", "14"), None)
-
-        self.assertEqual(_make_cppstd_flag("apple-clang", "5.1", "98"), "-std=c++98")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "5.1", "gnu98"), "-std=gnu++98")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "5.1", "11"), "-std=c++11")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "5.1", "14"), "-std=c++1y")
-
-        self.assertEqual(_make_cppstd_flag("apple-clang", "6.1", "11"), '-std=c++11')
-        self.assertEqual(_make_cppstd_flag("apple-clang", "6.1", "14"), '-std=c++14')
-        self.assertEqual(_make_cppstd_flag("apple-clang", "6.1", "17"), "-std=c++1z")
-
-        self.assertEqual(_make_cppstd_flag("apple-clang", "7", "11"), '-std=c++11')
-        self.assertEqual(_make_cppstd_flag("apple-clang", "7", "14"), '-std=c++14')
-        self.assertEqual(_make_cppstd_flag("apple-clang", "7", "17"), "-std=c++1z")
-
-        self.assertEqual(_make_cppstd_flag("apple-clang", "8", "11"), '-std=c++11')
-        self.assertEqual(_make_cppstd_flag("apple-clang", "8", "14"), '-std=c++14')
-        self.assertEqual(_make_cppstd_flag("apple-clang", "8", "17"), "-std=c++1z")
-
-        self.assertEqual(_make_cppstd_flag("apple-clang", "9", "11"), '-std=c++11')
-        self.assertEqual(_make_cppstd_flag("apple-clang", "9", "14"), '-std=c++14')
-        self.assertEqual(_make_cppstd_flag("apple-clang", "9", "17"), "-std=c++1z")
-
-        self.assertEqual(_make_cppstd_flag("apple-clang", "9.1", "11"), '-std=c++11')
-        self.assertEqual(_make_cppstd_flag("apple-clang", "9.1", "14"), '-std=c++14')
-        self.assertEqual(_make_cppstd_flag("apple-clang", "9.1", "17"), "-std=c++17")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "9.1", "20"), None)
-
-        self.assertEqual(_make_cppstd_flag("apple-clang", "10.0", "17"), "-std=c++17")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "10.0", "20"), "-std=c++2a")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "11.0", "17"), "-std=c++17")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "11.0", "20"), "-std=c++2a")
-
-        self.assertEqual(_make_cppstd_flag("apple-clang", "12.0", "17"), "-std=c++17")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "12.0", "20"), "-std=c++2a")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "12.0", "23"), None)
-
-        self.assertEqual(_make_cppstd_flag("apple-clang", "13.0", "17"), "-std=c++17")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "13.0", "gnu17"), "-std=gnu++17")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "13.0", "20"), "-std=c++20")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "13.0", "gnu20"), "-std=gnu++20")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "13.0", "23"), "-std=c++2b")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "13.0", "gnu23"), "-std=gnu++2b")
-
-        self.assertEqual(_make_cppstd_flag("apple-clang", "14.0", "17"), "-std=c++17")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "14.0", "gnu17"), "-std=gnu++17")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "14.0", "20"), "-std=c++20")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "14.0", "gnu20"), "-std=gnu++20")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "14.0", "23"), "-std=c++2b")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "14.0", "gnu23"), "-std=gnu++2b")
-
-        self.assertEqual(_make_cppstd_flag("apple-clang", "15.0", "17"), "-std=c++17")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "15.0", "gnu17"), "-std=gnu++17")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "15.0", "20"), "-std=c++20")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "15.0", "gnu20"), "-std=gnu++20")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "15.0", "23"), "-std=c++2b")
-        self.assertEqual(_make_cppstd_flag("apple-clang", "15.0", "gnu23"), "-std=gnu++2b")
-
-    def test_apple_clang_cppstd_defaults(self):
-        self.assertEqual(_make_cppstd_default("apple-clang", "2"), "gnu98")
-        self.assertEqual(_make_cppstd_default("apple-clang", "3"), "gnu98")
-        self.assertEqual(_make_cppstd_default("apple-clang", "4"), "gnu98")
-        self.assertEqual(_make_cppstd_default("apple-clang", "5"), "gnu98")
-        self.assertEqual(_make_cppstd_default("apple-clang", "6"), "gnu98")
-        self.assertEqual(_make_cppstd_default("apple-clang", "7"), "gnu98")
-        self.assertEqual(_make_cppstd_default("apple-clang", "8"), "gnu98")
-        self.assertEqual(_make_cppstd_default("apple-clang", "9"), "gnu98")
-        self.assertEqual(_make_cppstd_default("apple-clang", "10"), "gnu98")
-        self.assertEqual(_make_cppstd_default("apple-clang", "11"), "gnu98")
-        self.assertEqual(_make_cppstd_default("apple-clang", "12"), "gnu98")
-        self.assertEqual(_make_cppstd_default("apple-clang", "13"), "gnu98")
-        self.assertEqual(_make_cppstd_default("apple-clang", "14"), "gnu98")
-        self.assertEqual(_make_cppstd_default("apple-clang", "15"), "gnu98")
-
-    def test_visual_cppstd_flags(self):
-        self.assertEqual(_make_cppstd_flag("msvc", "170", "11"), None)
-        self.assertEqual(_make_cppstd_flag("msvc", "170", "14"), None)
-        self.assertEqual(_make_cppstd_flag("msvc", "170", "17"), None)
-
-        self.assertEqual(_make_cppstd_flag("msvc", "180", "11"), None)
-
-        self.assertEqual(_make_cppstd_flag("msvc", "190", "14"), '/std:c++14')
-        self.assertEqual(_make_cppstd_flag("msvc", "190", "17"), '/std:c++latest')
-
-        self.assertEqual(_make_cppstd_flag("msvc", "191", "11"), None)
-        self.assertEqual(_make_cppstd_flag("msvc", "191", "14"), '/std:c++14')
-        self.assertEqual(_make_cppstd_flag("msvc", "191", "17"), '/std:c++17')
-        self.assertEqual(_make_cppstd_flag("msvc", "191", "20"), '/std:c++latest')
-
-        self.assertEqual(_make_cppstd_flag("msvc", "192", "17"), '/std:c++17')
-        self.assertEqual(_make_cppstd_flag("msvc", "192", "20"), '/std:c++20')
-
-        self.assertEqual(_make_cppstd_flag("msvc", "193", "20"), '/std:c++20')
-        self.assertEqual(_make_cppstd_flag("msvc", "193", "23"), '/std:c++latest')
-
-    def test_visual_cppstd_defaults(self):
-        self.assertEqual(_make_cppstd_default("msvc", "170"), None)
-        self.assertEqual(_make_cppstd_default("msvc", "180"), None)
-        self.assertEqual(_make_cppstd_default("msvc", "190"), "14")
-        self.assertEqual(_make_cppstd_default("msvc", "191"), "14")
-        self.assertEqual(_make_cppstd_default("msvc", "192"), "14")
-        self.assertEqual(_make_cppstd_default("msvc", "193"), "14")
-
-    def test_intel_cppstd_flag(self):
-        self.assertEqual(_make_cppstd_flag("intel-cc", "19.1", "gnu98"), '-std=gnu++98')
-        self.assertEqual(_make_cppstd_flag("intel-cc", "19.1", "11"), '-std=c++11')
-        self.assertEqual(_make_cppstd_flag("intel-cc", "19.1", "14"), '-std=c++14')
-        self.assertEqual(_make_cppstd_flag("intel-cc", "19.1", "17"), '-std=c++17')
-        self.assertEqual(_make_cppstd_flag("intel-cc", "19.1", "20"), '-std=c++20')
-
-    def test_mcst_lcc_cppstd_defaults(self):
-        self.assertEqual(_make_cppstd_default("mcst-lcc", "1.19"), "gnu98")
-        self.assertEqual(_make_cppstd_default("mcst-lcc", "1.20"), "gnu98")
-        self.assertEqual(_make_cppstd_default("mcst-lcc", "1.21"), "gnu98")
-        self.assertEqual(_make_cppstd_default("mcst-lcc", "1.22"), "gnu98")
-        self.assertEqual(_make_cppstd_default("mcst-lcc", "1.23"), "gnu98")
-        self.assertEqual(_make_cppstd_default("mcst-lcc", "1.24"), "gnu14")
-        self.assertEqual(_make_cppstd_default("mcst-lcc", "1.25"), "gnu14")
-
-    def test_mcst_lcc_cppstd_flag(self):
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.19", "98"), "-std=c++98")
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.19", "11"), None)
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.19", "14"), None)
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.19", "17"), None)
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.19", "20"), None)
-
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.20", "98"), "-std=c++98")
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.20", "11"), None)
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.20", "14"), None)
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.20", "17"), None)
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.20", "20"), None)
-
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.21", "98"), "-std=c++98")
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.21", "11"), "-std=c++11")
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.21", "14"), "-std=c++14")
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.21", "17"), None)
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.21", "20"), None)
-
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.22", "98"), "-std=c++98")
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.22", "11"), "-std=c++11")
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.22", "14"), "-std=c++14")
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.22", "17"), None)
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.22", "20"), None)
-
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.23", "98"), "-std=c++98")
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.23", "11"), "-std=c++11")
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.23", "14"), "-std=c++14")
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.23", "17"), None)
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.23", "20"), None)
-
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.24", "98"), "-std=c++98")
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.24", "11"), "-std=c++11")
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.24", "14"), "-std=c++14")
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.24", "17"), "-std=c++17")
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.24", "20"), None)
-
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.25", "98"), "-std=c++98")
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.25", "11"), "-std=c++11")
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.25", "14"), "-std=c++14")
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.25", "17"), "-std=c++17")
-        self.assertEqual(_make_cppstd_flag("mcst-lcc", "1.25", "20"), "-std=c++2a")
diff --git a/conans/test/unittests/tools/build/test_can_run.py b/conans/test/unittests/tools/build/test_can_run.py
deleted file mode 100644
index f9556109d02..00000000000
--- a/conans/test/unittests/tools/build/test_can_run.py
+++ /dev/null
@@ -1,66 +0,0 @@
-import pytest
-
-from conans.test.utils.mocks import MockSettings, ConanFileMock
-from conan.tools.build import can_run
-
-
-class ConfigMock:
-    def __init__(self, run=None):
-        self.can_run = run
-
-    def get(self, conf_name, default=None, check_type=None):
-        return self.can_run
-
-
-@pytest.mark.parametrize("expected", [False, True])
-def test_can_run_explicit_config(expected):
-    """ When the config tools.build.cross_building:can_run is declared and evaluated (True|False),
-        can_run must return the same value.
-    """
-    config = ConfigMock(expected)
-    settings = MockSettings({"os": "Macos",
-                             "compiler": "apple-clang",
-                             "compiler.version": "11.0",
-                             "arch": "armv8"})
-    conanfile = ConanFileMock(settings)
-    conanfile.conf = config
-    assert expected == can_run(conanfile)
-
-
-@pytest.mark.parametrize("arch, expected", [("x86_64", False), ("armv8", True)])
-def test_can_run_cross_building(arch, expected):
-    """ When the config is None, and is cross-building, can_run must return False.
-    """
-    config = ConfigMock(None)
-    settings_build = MockSettings({"os": "Macos",
-                             "compiler": "apple-clang",
-                             "compiler.version": "11.0",
-                             "arch": "armv8"})
-    settings = MockSettings({"os": "Macos",
-                             "compiler": "apple-clang",
-                             "compiler.version": "11.0",
-                             "arch": arch})
-    conanfile = ConanFileMock()
-    conanfile.settings = settings
-    conanfile.settings_build = settings_build
-    conanfile.conf = config
-    assert expected == can_run(conanfile)
-
-
-def test_can_run_cross_building_with_explicit():
-    """ When the config is True or False, and is cross-building, can_run must follow the config.
-    """
-    config = ConfigMock(True)
-    settings_build = MockSettings({"os": "Macos",
-                             "compiler": "apple-clang",
-                             "compiler.version": "11.0",
-                             "arch": "armv8"})
-    settings = MockSettings({"os": "Macos",
-                             "compiler": "apple-clang",
-                             "compiler.version": "11.0",
-                             "arch": "x86_64"})
-    conanfile = ConanFileMock()
-    conanfile.settings = settings
-    conanfile.settings_build = settings_build
-    conanfile.conf = config
-    assert True == can_run(conanfile)
diff --git a/conans/test/unittests/tools/build/test_cppstd.py b/conans/test/unittests/tools/build/test_cppstd.py
deleted file mode 100644
index c12167684e4..00000000000
--- a/conans/test/unittests/tools/build/test_cppstd.py
+++ /dev/null
@@ -1,226 +0,0 @@
-import pytest
-
-from conan.internal.api.detect_api import detect_cppstd
-from conan.tools.build import supported_cppstd, check_min_cppstd, valid_min_cppstd
-from conans.errors import ConanException, ConanInvalidConfiguration
-from conans.model.version import Version
-from conans.test.utils.mocks import MockSettings, ConanFileMock
-
-
-@pytest.mark.parametrize("compiler,compiler_version,values", [
-    ("clang", "2.0", []),
-    ("clang", "2.1", ['98', 'gnu98', '11', 'gnu11']),
-    ("clang", "2.2", ['98', 'gnu98', '11', 'gnu11']),
-    ("clang", "3.1", ['98', 'gnu98', '11', 'gnu11']),
-    ("clang", "3.4", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14"]),
-    ("clang", "3.5", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17"]),
-    ("clang", "4.9", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17"]),
-    ("clang", "5", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17"]),
-    ("clang", "6", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17", "20", "gnu20"]),
-    ("clang", "12", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17", "20",
-                     "gnu20", "23", "gnu23"])
-])
-def test_supported_cppstd_clang(compiler, compiler_version, values):
-    settings = MockSettings({"compiler": compiler, "compiler.version": compiler_version})
-    conanfile = ConanFileMock(settings)
-    sot = supported_cppstd(conanfile)
-    assert sot == values
-
-
-@pytest.mark.parametrize("compiler,compiler_version,result", [
-    ("gcc", "5", 'gnu98'),
-    ("gcc", "8", "gnu14"),
-    ("gcc", "12", "gnu17"),
-    ("msvc", "190", "14"),
-    ("apple-clang", "10.0", "gnu98"),
-    # We diverge from the default cppstd for apple-clang >= 11
-    ("apple-clang", "12.0", "gnu17"),
-    ("clang", "4", "gnu98"),
-    ("clang", "6", "gnu14"),
-    ("clang", "17", "gnu17")
-])
-def test_detected_cppstd(compiler, compiler_version, result):
-    sot = detect_cppstd(compiler, Version(compiler_version))
-    assert sot == result
-
-
-def test_supported_cppstd_with_specific_values():
-    settings = MockSettings({})
-    conanfile = ConanFileMock(settings)
-    sot = supported_cppstd(conanfile, "clang", "3.1")
-    assert sot == ['98', 'gnu98', '11', 'gnu11']
-
-
-def test_supported_cppstd_error():
-    settings = MockSettings({})
-    conanfile = ConanFileMock(settings)
-    with pytest.raises(ConanException) as exc:
-        supported_cppstd(conanfile)
-    assert "Called supported_cppstd with no compiler or no compiler.version" in str(exc)
-
-
-@pytest.mark.parametrize("compiler,compiler_version,values", [
-    ("gcc", "2.0", []),
-    ("gcc", "3.4", ['98', 'gnu98']),
-    ("gcc", "4.2", ['98', 'gnu98']),
-    ("gcc", "4.3", ['98', 'gnu98', '11', 'gnu11']),
-    ("gcc", "4.8", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14"]),
-    ("gcc", "5", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17"]),
-    ("gcc", "8", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17", "20", "gnu20"]),
-    ("gcc", "11", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17", "20", "gnu20",
-                   "23", "gnu23"])
-])
-def test_supported_cppstd_gcc(compiler, compiler_version, values):
-    settings = MockSettings({"compiler": compiler, "compiler.version": compiler_version})
-    conanfile = ConanFileMock(settings)
-    sot = supported_cppstd(conanfile)
-    assert sot == values
-
-
-@pytest.mark.parametrize("compiler,compiler_version,values", [
-    ("apple-clang", "3.9", []),
-    ("apple-clang", "4.0", ['98', 'gnu98', '11', 'gnu11']),
-    ("apple-clang", "5.0", ['98', 'gnu98', '11', 'gnu11']),
-    ("apple-clang", "5.1", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14"]),
-    ("apple-clang", "6.1", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17"]),
-    ("apple-clang", "9.5", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17"]),
-    ("apple-clang", "10", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17", "20",
-                           "gnu20"]),
-    ("apple-clang", "13", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17", "20",
-                           "gnu20", "23", "gnu23"]),
-])
-def test_supported_cppstd_apple_clang(compiler, compiler_version, values):
-    settings = MockSettings({"compiler": compiler, "compiler.version": compiler_version})
-    conanfile = ConanFileMock(settings)
-    sot = supported_cppstd(conanfile)
-    assert sot == values
-
-
-@pytest.mark.parametrize("compiler,compiler_version,values", [
-    ("msvc", "180", []),
-    ("msvc", "190", ['14']),
-    ("msvc", "191", ['14', '17']),
-    ("msvc", "192", ['14', '17', '20']),
-    ("msvc", "193", ['14', '17', '20', '23']),
-])
-def test_supported_cppstd_msvc(compiler, compiler_version, values):
-    settings = MockSettings({"compiler": compiler, "compiler.version": compiler_version})
-    conanfile = ConanFileMock(settings)
-    sot = supported_cppstd(conanfile)
-    assert sot == values
-
-
-@pytest.mark.parametrize("compiler,compiler_version,values", [
-    ("mcst-lcc", "1.20", ['98', 'gnu98']),
-    ("mcst-lcc", "1.21", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14"]),
-    ("mcst-lcc", "1.23", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14"]),
-    ("mcst-lcc", "1.24", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17"]),
-    ("mcst-lcc", "1.25", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17", "20", "gnu20"])
-])
-def test_supported_cppstd_mcst(compiler, compiler_version, values):
-    settings = MockSettings({"compiler": compiler, "compiler.version": compiler_version})
-    conanfile = ConanFileMock(settings)
-    sot = supported_cppstd(conanfile)
-    assert sot == values
-
-
-@pytest.mark.parametrize("compiler,compiler_version,values", [
-    ("qcc", "4.4", ['98', 'gnu98']),
-    ("qcc", "5.4", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17"]),
-    ("qcc", "8.3", ['98', 'gnu98', '11', 'gnu11', "14", "gnu14", "17", "gnu17"]),
-])
-def test_supported_cppstd_qcc(compiler, compiler_version, values):
-    settings = MockSettings({"compiler": compiler, "compiler.version": compiler_version})
-    conanfile = ConanFileMock(settings)
-    sot = supported_cppstd(conanfile)
-    assert sot == values
-
-
-def test_check_cppstd_type():
-    """ cppstd must be a number
-    """
-    conanfile = ConanFileMock(MockSettings({}))
-    with pytest.raises(ConanException) as exc:
-        check_min_cppstd(conanfile, "gnu17", False)
-
-    assert "cppstd parameter must be a number", str(exc)
-
-
-def _create_conanfile(compiler, version, os, cppstd, libcxx=None):
-    settings = MockSettings({"arch": "x86_64",
-                             "build_type": "Debug",
-                             "os": os,
-                             "compiler": compiler,
-                             "compiler.version": version,
-                             "compiler.cppstd": cppstd})
-    if libcxx:
-        settings.values["compiler.libcxx"] = libcxx
-    conanfile = ConanFileMock(settings)
-    return conanfile
-
-
-@pytest.mark.parametrize("cppstd", ["98", "11", "14", "17"])
-def test_check_min_cppstd_from_settings(cppstd):
-    """ check_min_cppstd must accept cppstd less/equal than cppstd in settings
-    """
-    conanfile = _create_conanfile("gcc", "9", "Linux", "17", "libstdc++")
-    check_min_cppstd(conanfile, cppstd, False)
-
-
-@pytest.mark.parametrize("cppstd", ["98", "11", "14"])
-def test_check_min_cppstd_from_outdated_settings(cppstd):
-    """ check_min_cppstd must raise when cppstd is greater when supported on settings
-    """
-    conanfile = _create_conanfile("gcc", "9", "Linux", cppstd, "libstdc++")
-    with pytest.raises(ConanInvalidConfiguration) as exc:
-        check_min_cppstd(conanfile, "17", False)
-    assert "Current cppstd ({}) is lower than the required C++ standard (17)." \
-           "".format(cppstd) == str(exc.value)
-
-
-@pytest.mark.parametrize("cppstd", ["98", "11", "14", "17"])
-def test_check_min_cppstd_from_settings_with_extension(cppstd):
-    """ current cppstd in settings must has GNU extension when extensions is enabled
-    """
-    conanfile = _create_conanfile("gcc", "9", "Linux", "gnu17", "libstdc++")
-    check_min_cppstd(conanfile, cppstd, True)
-
-    conanfile.settings.values["compiler.cppstd"] = "17"
-    with pytest.raises(ConanException) as raises:
-        check_min_cppstd(conanfile, cppstd, True)
-    assert "The cppstd GNU extension is required" == str(raises.value)
-
-
-@pytest.mark.parametrize("cppstd", ["98", "11", "14", "17"])
-def test_valid_min_cppstd_from_settings(cppstd):
-    """ valid_min_cppstd must accept cppstd less/equal than cppstd in settings
-    """
-    conanfile = _create_conanfile("gcc", "9", "Linux", "17", "libstdc++")
-    assert valid_min_cppstd(conanfile, cppstd, False)
-
-
-@pytest.mark.parametrize("cppstd", ["98", "11", "14"])
-def test_valid_min_cppstd_from_outdated_settings(cppstd):
-    """ valid_min_cppstd returns False when cppstd is greater when supported on settings
-    """
-    conanfile = _create_conanfile("gcc", "9", "Linux", cppstd, "libstdc++")
-    assert not valid_min_cppstd(conanfile, "17", False)
-
-
-@pytest.mark.parametrize("cppstd", ["98", "11", "14", "17"])
-def test_valid_min_cppstd_from_settings_with_extension(cppstd):
-    """ valid_min_cppstd must returns True when current cppstd in settings has GNU extension and
-        extensions is enabled
-    """
-    conanfile = _create_conanfile("gcc", "9", "Linux", "gnu17", "libstdc++")
-    assert valid_min_cppstd(conanfile, cppstd, True)
-
-    conanfile.settings.values["compiler.cppstd"] = "17"
-    assert not valid_min_cppstd(conanfile, cppstd, True)
-
-
-def test_valid_min_cppstd_unsupported_standard():
-    """ valid_min_cppstd must returns False when the compiler does not support a standard
-    """
-    conanfile = _create_conanfile("gcc", "9", "Linux", None, "libstdc++")
-    assert not valid_min_cppstd(conanfile, "42", False)
diff --git a/conans/test/unittests/tools/build/test_cross_building.py b/conans/test/unittests/tools/build/test_cross_building.py
deleted file mode 100644
index 71806c24c27..00000000000
--- a/conans/test/unittests/tools/build/test_cross_building.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import pytest
-
-from conan.tools.build import cross_building
-from conans.test.utils.mocks import ConanFileMock
-
-
-@pytest.mark.parametrize("cross_build", (True, False))
-def test_using_cross_build_conf(cross_build):
-    """
-    Tests cross_building function is using the conf variable to force or not.
-
-    Issue related: https://github.com/conan-io/conan/issues/15392
-    """
-    conanfile = ConanFileMock()
-    conanfile.conf.define("tools.build.cross_building:cross_build", cross_build)
-    assert cross_building(conanfile) == cross_build
diff --git a/conans/test/unittests/tools/build/test_stdcpp_library.py b/conans/test/unittests/tools/build/test_stdcpp_library.py
deleted file mode 100644
index 6ead0bcec7e..00000000000
--- a/conans/test/unittests/tools/build/test_stdcpp_library.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import pytest
-from conan.tools.build import stdcpp_library
-from conans.test.utils.mocks import MockSettings, ConanFileMock
-
-
-@pytest.mark.parametrize("libcxx,expected_library", [
-    ("libstdc++", "stdc++"),
-    ("libstdc++11", "stdc++"),
-    ("libc++", "c++"),
-    ("c++_shared", "c++_shared"),
-    ("c++_static", "c++_static"),
-    ("foobar", None)
-])
-def test_stdcpp_library(libcxx, expected_library):
-    settings = MockSettings({"compiler.libcxx": libcxx})
-    conanfile = ConanFileMock(settings)
-
-    assert stdcpp_library(conanfile) == expected_library
diff --git a/conans/test/utils/__init__.py b/conans/test/utils/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/conans/test/.gitignore b/test/.gitignore
similarity index 100%
rename from conans/test/.gitignore
rename to test/.gitignore
diff --git a/conans/test/README.md b/test/README.md
similarity index 100%
rename from conans/test/README.md
rename to test/README.md
diff --git a/conans/test/functional/build_helpers/__init__.py b/test/__init__.py
similarity index 100%
rename from conans/test/functional/build_helpers/__init__.py
rename to test/__init__.py
diff --git a/conans/test/conftest.py b/test/conftest.py
similarity index 100%
rename from conans/test/conftest.py
rename to test/conftest.py
diff --git a/conans/test/functional/build_requires/__init__.py b/test/functional/__init__.py
similarity index 100%
rename from conans/test/functional/build_requires/__init__.py
rename to test/functional/__init__.py
diff --git a/conans/test/functional/command/__init__.py b/test/functional/build_helpers/__init__.py
similarity index 100%
rename from conans/test/functional/command/__init__.py
rename to test/functional/build_helpers/__init__.py
diff --git a/conans/test/functional/build_helpers/cmake_ios_cross_build_test.py b/test/functional/build_helpers/cmake_ios_cross_build_test.py
similarity index 100%
rename from conans/test/functional/build_helpers/cmake_ios_cross_build_test.py
rename to test/functional/build_helpers/cmake_ios_cross_build_test.py
diff --git a/conans/test/functional/conanfile/__init__.py b/test/functional/build_requires/__init__.py
similarity index 100%
rename from conans/test/functional/conanfile/__init__.py
rename to test/functional/build_requires/__init__.py
diff --git a/conans/test/functional/graph/__init__.py b/test/functional/command/__init__.py
similarity index 100%
rename from conans/test/functional/graph/__init__.py
rename to test/functional/command/__init__.py
diff --git a/conans/test/functional/command/config_install_test.py b/test/functional/command/config_install_test.py
similarity index 100%
rename from conans/test/functional/command/config_install_test.py
rename to test/functional/command/config_install_test.py
diff --git a/conans/test/functional/command/devflow_test.py b/test/functional/command/devflow_test.py
similarity index 100%
rename from conans/test/functional/command/devflow_test.py
rename to test/functional/command/devflow_test.py
diff --git a/conans/test/functional/command/export_test.py b/test/functional/command/export_test.py
similarity index 100%
rename from conans/test/functional/command/export_test.py
rename to test/functional/command/export_test.py
diff --git a/conans/test/functional/command/new_test.py b/test/functional/command/new_test.py
similarity index 100%
rename from conans/test/functional/command/new_test.py
rename to test/functional/command/new_test.py
diff --git a/conans/test/functional/command/profile_test.py b/test/functional/command/profile_test.py
similarity index 100%
rename from conans/test/functional/command/profile_test.py
rename to test/functional/command/profile_test.py
diff --git a/conans/test/functional/command/test_build.py b/test/functional/command/test_build.py
similarity index 100%
rename from conans/test/functional/command/test_build.py
rename to test/functional/command/test_build.py
diff --git a/conans/test/functional/command/test_custom_symlink_home.py b/test/functional/command/test_custom_symlink_home.py
similarity index 100%
rename from conans/test/functional/command/test_custom_symlink_home.py
rename to test/functional/command/test_custom_symlink_home.py
diff --git a/conans/test/functional/command/test_install_deploy.py b/test/functional/command/test_install_deploy.py
similarity index 100%
rename from conans/test/functional/command/test_install_deploy.py
rename to test/functional/command/test_install_deploy.py
diff --git a/conans/test/functional/layout/__init__.py b/test/functional/conanfile/__init__.py
similarity index 100%
rename from conans/test/functional/layout/__init__.py
rename to test/functional/conanfile/__init__.py
diff --git a/conans/test/functional/conanfile/runner_test.py b/test/functional/conanfile/runner_test.py
similarity index 100%
rename from conans/test/functional/conanfile/runner_test.py
rename to test/functional/conanfile/runner_test.py
diff --git a/conans/test/functional/settings/__init__.py b/test/functional/graph/__init__.py
similarity index 100%
rename from conans/test/functional/settings/__init__.py
rename to test/functional/graph/__init__.py
diff --git a/conans/test/functional/graph/test_graph_build_mode.py b/test/functional/graph/test_graph_build_mode.py
similarity index 100%
rename from conans/test/functional/graph/test_graph_build_mode.py
rename to test/functional/graph/test_graph_build_mode.py
diff --git a/conans/test/functional/graph/test_transitive_build_scripts.py b/test/functional/graph/test_transitive_build_scripts.py
similarity index 100%
rename from conans/test/functional/graph/test_transitive_build_scripts.py
rename to test/functional/graph/test_transitive_build_scripts.py
diff --git a/conans/test/functional/settings/cppstd/__init__.py b/test/functional/layout/__init__.py
similarity index 100%
rename from conans/test/functional/settings/cppstd/__init__.py
rename to test/functional/layout/__init__.py
diff --git a/conans/test/functional/layout/test_build_system_layout_helpers.py b/test/functional/layout/test_build_system_layout_helpers.py
similarity index 100%
rename from conans/test/functional/layout/test_build_system_layout_helpers.py
rename to test/functional/layout/test_build_system_layout_helpers.py
diff --git a/conans/test/functional/layout/test_editable_cmake.py b/test/functional/layout/test_editable_cmake.py
similarity index 100%
rename from conans/test/functional/layout/test_editable_cmake.py
rename to test/functional/layout/test_editable_cmake.py
diff --git a/conans/test/functional/layout/test_editable_cmake_components.py b/test/functional/layout/test_editable_cmake_components.py
similarity index 100%
rename from conans/test/functional/layout/test_editable_cmake_components.py
rename to test/functional/layout/test_editable_cmake_components.py
diff --git a/conans/test/functional/layout/test_editable_msbuild.py b/test/functional/layout/test_editable_msbuild.py
similarity index 100%
rename from conans/test/functional/layout/test_editable_msbuild.py
rename to test/functional/layout/test_editable_msbuild.py
diff --git a/conans/test/functional/layout/test_exports_sources.py b/test/functional/layout/test_exports_sources.py
similarity index 100%
rename from conans/test/functional/layout/test_exports_sources.py
rename to test/functional/layout/test_exports_sources.py
diff --git a/conans/test/functional/layout/test_in_cache.py b/test/functional/layout/test_in_cache.py
similarity index 100%
rename from conans/test/functional/layout/test_in_cache.py
rename to test/functional/layout/test_in_cache.py
diff --git a/conans/test/functional/layout/test_in_subfolder.py b/test/functional/layout/test_in_subfolder.py
similarity index 100%
rename from conans/test/functional/layout/test_in_subfolder.py
rename to test/functional/layout/test_in_subfolder.py
diff --git a/conans/test/functional/layout/test_layout_autopackage.py b/test/functional/layout/test_layout_autopackage.py
similarity index 100%
rename from conans/test/functional/layout/test_layout_autopackage.py
rename to test/functional/layout/test_layout_autopackage.py
diff --git a/conans/test/functional/layout/test_local_commands.py b/test/functional/layout/test_local_commands.py
similarity index 100%
rename from conans/test/functional/layout/test_local_commands.py
rename to test/functional/layout/test_local_commands.py
diff --git a/conans/test/functional/layout/test_source_folder.py b/test/functional/layout/test_source_folder.py
similarity index 100%
rename from conans/test/functional/layout/test_source_folder.py
rename to test/functional/layout/test_source_folder.py
diff --git a/conans/test/functional/only_source_test.py b/test/functional/only_source_test.py
similarity index 100%
rename from conans/test/functional/only_source_test.py
rename to test/functional/only_source_test.py
diff --git a/conans/test/functional/revisions_test.py b/test/functional/revisions_test.py
similarity index 100%
rename from conans/test/functional/revisions_test.py
rename to test/functional/revisions_test.py
diff --git a/conans/test/functional/toolchains/__init__.py b/test/functional/settings/__init__.py
similarity index 100%
rename from conans/test/functional/toolchains/__init__.py
rename to test/functional/settings/__init__.py
diff --git a/conans/test/functional/settings/conan_settings_preprocessor_test.py b/test/functional/settings/conan_settings_preprocessor_test.py
similarity index 100%
rename from conans/test/functional/settings/conan_settings_preprocessor_test.py
rename to test/functional/settings/conan_settings_preprocessor_test.py
diff --git a/conans/test/functional/toolchains/android/__init__.py b/test/functional/settings/cppstd/__init__.py
similarity index 100%
rename from conans/test/functional/toolchains/android/__init__.py
rename to test/functional/settings/cppstd/__init__.py
diff --git a/conans/test/functional/settings/cppstd/compiler_cppstd_test.py b/test/functional/settings/cppstd/compiler_cppstd_test.py
similarity index 100%
rename from conans/test/functional/settings/cppstd/compiler_cppstd_test.py
rename to test/functional/settings/cppstd/compiler_cppstd_test.py
diff --git a/conans/test/functional/settings/libcxx_setting_test.py b/test/functional/settings/libcxx_setting_test.py
similarity index 100%
rename from conans/test/functional/settings/libcxx_setting_test.py
rename to test/functional/settings/libcxx_setting_test.py
diff --git a/conans/test/functional/subsystems_build_test.py b/test/functional/subsystems_build_test.py
similarity index 100%
rename from conans/test/functional/subsystems_build_test.py
rename to test/functional/subsystems_build_test.py
diff --git a/conans/test/functional/test_local_recipes_index.py b/test/functional/test_local_recipes_index.py
similarity index 100%
rename from conans/test/functional/test_local_recipes_index.py
rename to test/functional/test_local_recipes_index.py
diff --git a/conans/test/functional/test_profile_detect_api.py b/test/functional/test_profile_detect_api.py
similarity index 100%
rename from conans/test/functional/test_profile_detect_api.py
rename to test/functional/test_profile_detect_api.py
diff --git a/conans/test/functional/test_third_party_patch_flow.py b/test/functional/test_third_party_patch_flow.py
similarity index 100%
rename from conans/test/functional/test_third_party_patch_flow.py
rename to test/functional/test_third_party_patch_flow.py
diff --git a/conans/test/functional/toolchains/apple/__init__.py b/test/functional/toolchains/__init__.py
similarity index 100%
rename from conans/test/functional/toolchains/apple/__init__.py
rename to test/functional/toolchains/__init__.py
diff --git a/conans/test/functional/toolchains/cmake/__init__.py b/test/functional/toolchains/android/__init__.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/__init__.py
rename to test/functional/toolchains/android/__init__.py
diff --git a/conans/test/functional/toolchains/android/test_using_cmake.py b/test/functional/toolchains/android/test_using_cmake.py
similarity index 100%
rename from conans/test/functional/toolchains/android/test_using_cmake.py
rename to test/functional/toolchains/android/test_using_cmake.py
diff --git a/conans/test/functional/toolchains/cmake/cmakedeps/__init__.py b/test/functional/toolchains/apple/__init__.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/cmakedeps/__init__.py
rename to test/functional/toolchains/apple/__init__.py
diff --git a/conans/test/functional/toolchains/apple/test_xcodebuild.py b/test/functional/toolchains/apple/test_xcodebuild.py
similarity index 100%
rename from conans/test/functional/toolchains/apple/test_xcodebuild.py
rename to test/functional/toolchains/apple/test_xcodebuild.py
diff --git a/conans/test/functional/toolchains/apple/test_xcodebuild_targets.py b/test/functional/toolchains/apple/test_xcodebuild_targets.py
similarity index 100%
rename from conans/test/functional/toolchains/apple/test_xcodebuild_targets.py
rename to test/functional/toolchains/apple/test_xcodebuild_targets.py
diff --git a/conans/test/functional/toolchains/apple/test_xcodedeps_build_configs.py b/test/functional/toolchains/apple/test_xcodedeps_build_configs.py
similarity index 100%
rename from conans/test/functional/toolchains/apple/test_xcodedeps_build_configs.py
rename to test/functional/toolchains/apple/test_xcodedeps_build_configs.py
diff --git a/conans/test/functional/toolchains/apple/test_xcodedeps_components.py b/test/functional/toolchains/apple/test_xcodedeps_components.py
similarity index 100%
rename from conans/test/functional/toolchains/apple/test_xcodedeps_components.py
rename to test/functional/toolchains/apple/test_xcodedeps_components.py
diff --git a/conans/test/functional/toolchains/apple/test_xcodetoolchain.py b/test/functional/toolchains/apple/test_xcodetoolchain.py
similarity index 100%
rename from conans/test/functional/toolchains/apple/test_xcodetoolchain.py
rename to test/functional/toolchains/apple/test_xcodetoolchain.py
diff --git a/conans/test/functional/toolchains/env/__init__.py b/test/functional/toolchains/cmake/__init__.py
similarity index 100%
rename from conans/test/functional/toolchains/env/__init__.py
rename to test/functional/toolchains/cmake/__init__.py
diff --git a/conans/test/functional/toolchains/gnu/__init__.py b/test/functional/toolchains/cmake/cmakedeps/__init__.py
similarity index 100%
rename from conans/test/functional/toolchains/gnu/__init__.py
rename to test/functional/toolchains/cmake/cmakedeps/__init__.py
diff --git a/conans/test/functional/toolchains/cmake/cmakedeps/test_apple_frameworks.py b/test/functional/toolchains/cmake/cmakedeps/test_apple_frameworks.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/cmakedeps/test_apple_frameworks.py
rename to test/functional/toolchains/cmake/cmakedeps/test_apple_frameworks.py
diff --git a/conans/test/functional/toolchains/cmake/cmakedeps/test_build_context_protobuf.py b/test/functional/toolchains/cmake/cmakedeps/test_build_context_protobuf.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/cmakedeps/test_build_context_protobuf.py
rename to test/functional/toolchains/cmake/cmakedeps/test_build_context_protobuf.py
diff --git a/conans/test/functional/toolchains/cmake/cmakedeps/test_build_context_transitive_build.py b/test/functional/toolchains/cmake/cmakedeps/test_build_context_transitive_build.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/cmakedeps/test_build_context_transitive_build.py
rename to test/functional/toolchains/cmake/cmakedeps/test_build_context_transitive_build.py
diff --git a/conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps.py
rename to test/functional/toolchains/cmake/cmakedeps/test_cmakedeps.py
diff --git a/conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_aggregator.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_aggregator.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_aggregator.py
rename to test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_aggregator.py
diff --git a/conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_aliases.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_aliases.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_aliases.py
rename to test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_aliases.py
diff --git a/conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_and_linker_flags.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_and_linker_flags.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_and_linker_flags.py
rename to test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_and_linker_flags.py
diff --git a/conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_build_modules.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_build_modules.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_build_modules.py
rename to test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_build_modules.py
diff --git a/conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_components.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_components.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_components.py
rename to test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_components.py
diff --git a/conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_components_names.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_components_names.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_components_names.py
rename to test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_components_names.py
diff --git a/conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_custom_configs.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_custom_configs.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_custom_configs.py
rename to test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_custom_configs.py
diff --git a/conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_find_module_and_config.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_find_module_and_config.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_find_module_and_config.py
rename to test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_find_module_and_config.py
diff --git a/conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_transitivity.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_transitivity.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_transitivity.py
rename to test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_transitivity.py
diff --git a/conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_versions.py b/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_versions.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_versions.py
rename to test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_versions.py
diff --git a/conans/test/functional/toolchains/cmake/cmakedeps/test_conditional_build_type.py b/test/functional/toolchains/cmake/cmakedeps/test_conditional_build_type.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/cmakedeps/test_conditional_build_type.py
rename to test/functional/toolchains/cmake/cmakedeps/test_conditional_build_type.py
diff --git a/conans/test/functional/toolchains/cmake/cmakedeps/test_link_order.py b/test/functional/toolchains/cmake/cmakedeps/test_link_order.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/cmakedeps/test_link_order.py
rename to test/functional/toolchains/cmake/cmakedeps/test_link_order.py
diff --git a/conans/test/functional/toolchains/cmake/cmakedeps/test_weird_library_names.py b/test/functional/toolchains/cmake/cmakedeps/test_weird_library_names.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/cmakedeps/test_weird_library_names.py
rename to test/functional/toolchains/cmake/cmakedeps/test_weird_library_names.py
diff --git a/conans/test/functional/toolchains/cmake/test_cmake.py b/test/functional/toolchains/cmake/test_cmake.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/test_cmake.py
rename to test/functional/toolchains/cmake/test_cmake.py
diff --git a/conans/test/functional/toolchains/cmake/test_cmake_and_no_soname_flag.py b/test/functional/toolchains/cmake/test_cmake_and_no_soname_flag.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/test_cmake_and_no_soname_flag.py
rename to test/functional/toolchains/cmake/test_cmake_and_no_soname_flag.py
diff --git a/conans/test/functional/toolchains/cmake/test_cmake_toolchain.py b/test/functional/toolchains/cmake/test_cmake_toolchain.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/test_cmake_toolchain.py
rename to test/functional/toolchains/cmake/test_cmake_toolchain.py
diff --git a/conans/test/functional/toolchains/cmake/test_cmake_toolchain_m1.py b/test/functional/toolchains/cmake/test_cmake_toolchain_m1.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/test_cmake_toolchain_m1.py
rename to test/functional/toolchains/cmake/test_cmake_toolchain_m1.py
diff --git a/conans/test/functional/toolchains/cmake/test_cmake_toolchain_vxworks_clang.py b/test/functional/toolchains/cmake/test_cmake_toolchain_vxworks_clang.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/test_cmake_toolchain_vxworks_clang.py
rename to test/functional/toolchains/cmake/test_cmake_toolchain_vxworks_clang.py
diff --git a/conans/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py b/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py
rename to test/functional/toolchains/cmake/test_cmake_toolchain_win_clang.py
diff --git a/conans/test/functional/toolchains/cmake/test_cmake_toolchain_xcode_flags.py b/test/functional/toolchains/cmake/test_cmake_toolchain_xcode_flags.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/test_cmake_toolchain_xcode_flags.py
rename to test/functional/toolchains/cmake/test_cmake_toolchain_xcode_flags.py
diff --git a/conans/test/functional/toolchains/cmake/test_cmaketoolchain_paths.py b/test/functional/toolchains/cmake/test_cmaketoolchain_paths.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/test_cmaketoolchain_paths.py
rename to test/functional/toolchains/cmake/test_cmaketoolchain_paths.py
diff --git a/conans/test/functional/toolchains/cmake/test_ninja.py b/test/functional/toolchains/cmake/test_ninja.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/test_ninja.py
rename to test/functional/toolchains/cmake/test_ninja.py
diff --git a/conans/test/functional/toolchains/cmake/test_presets_inherit.py b/test/functional/toolchains/cmake/test_presets_inherit.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/test_presets_inherit.py
rename to test/functional/toolchains/cmake/test_presets_inherit.py
diff --git a/conans/test/functional/toolchains/cmake/test_shared_cmake.py b/test/functional/toolchains/cmake/test_shared_cmake.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/test_shared_cmake.py
rename to test/functional/toolchains/cmake/test_shared_cmake.py
diff --git a/conans/test/functional/toolchains/cmake/test_universal_binaries.py b/test/functional/toolchains/cmake/test_universal_binaries.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/test_universal_binaries.py
rename to test/functional/toolchains/cmake/test_universal_binaries.py
diff --git a/conans/test/functional/toolchains/cmake/test_v2_cmake_template.py b/test/functional/toolchains/cmake/test_v2_cmake_template.py
similarity index 100%
rename from conans/test/functional/toolchains/cmake/test_v2_cmake_template.py
rename to test/functional/toolchains/cmake/test_v2_cmake_template.py
diff --git a/conans/test/functional/toolchains/conftest.py b/test/functional/toolchains/conftest.py
similarity index 100%
rename from conans/test/functional/toolchains/conftest.py
rename to test/functional/toolchains/conftest.py
diff --git a/conans/test/functional/toolchains/gnu/autotools/__init__.py b/test/functional/toolchains/env/__init__.py
similarity index 100%
rename from conans/test/functional/toolchains/gnu/autotools/__init__.py
rename to test/functional/toolchains/env/__init__.py
diff --git a/conans/test/functional/toolchains/env/test_complete.py b/test/functional/toolchains/env/test_complete.py
similarity index 100%
rename from conans/test/functional/toolchains/env/test_complete.py
rename to test/functional/toolchains/env/test_complete.py
diff --git a/conans/test/functional/toolchains/env/test_virtualenv_powershell.py b/test/functional/toolchains/env/test_virtualenv_powershell.py
similarity index 100%
rename from conans/test/functional/toolchains/env/test_virtualenv_powershell.py
rename to test/functional/toolchains/env/test_virtualenv_powershell.py
diff --git a/conans/test/functional/toolchains/google/__init__.py b/test/functional/toolchains/gnu/__init__.py
similarity index 100%
rename from conans/test/functional/toolchains/google/__init__.py
rename to test/functional/toolchains/gnu/__init__.py
diff --git a/conans/test/functional/toolchains/intel/__init__.py b/test/functional/toolchains/gnu/autotools/__init__.py
similarity index 100%
rename from conans/test/functional/toolchains/intel/__init__.py
rename to test/functional/toolchains/gnu/autotools/__init__.py
diff --git a/conans/test/functional/toolchains/gnu/autotools/test_apple_toolchain.py b/test/functional/toolchains/gnu/autotools/test_apple_toolchain.py
similarity index 100%
rename from conans/test/functional/toolchains/gnu/autotools/test_apple_toolchain.py
rename to test/functional/toolchains/gnu/autotools/test_apple_toolchain.py
diff --git a/conans/test/functional/toolchains/gnu/autotools/test_basic.py b/test/functional/toolchains/gnu/autotools/test_basic.py
similarity index 100%
rename from conans/test/functional/toolchains/gnu/autotools/test_basic.py
rename to test/functional/toolchains/gnu/autotools/test_basic.py
diff --git a/conans/test/functional/toolchains/gnu/autotools/test_crossbuild_triplet.py b/test/functional/toolchains/gnu/autotools/test_crossbuild_triplet.py
similarity index 100%
rename from conans/test/functional/toolchains/gnu/autotools/test_crossbuild_triplet.py
rename to test/functional/toolchains/gnu/autotools/test_crossbuild_triplet.py
diff --git a/conans/test/functional/toolchains/gnu/autotools/test_ios.py b/test/functional/toolchains/gnu/autotools/test_ios.py
similarity index 100%
rename from conans/test/functional/toolchains/gnu/autotools/test_ios.py
rename to test/functional/toolchains/gnu/autotools/test_ios.py
diff --git a/conans/test/functional/toolchains/gnu/autotools/test_win_bash.py b/test/functional/toolchains/gnu/autotools/test_win_bash.py
similarity index 100%
rename from conans/test/functional/toolchains/gnu/autotools/test_win_bash.py
rename to test/functional/toolchains/gnu/autotools/test_win_bash.py
diff --git a/conans/test/functional/toolchains/gnu/test_gnutoolchain_apple.py b/test/functional/toolchains/gnu/test_gnutoolchain_apple.py
similarity index 100%
rename from conans/test/functional/toolchains/gnu/test_gnutoolchain_apple.py
rename to test/functional/toolchains/gnu/test_gnutoolchain_apple.py
diff --git a/conans/test/functional/toolchains/gnu/test_makedeps.py b/test/functional/toolchains/gnu/test_makedeps.py
similarity index 100%
rename from conans/test/functional/toolchains/gnu/test_makedeps.py
rename to test/functional/toolchains/gnu/test_makedeps.py
diff --git a/conans/test/functional/toolchains/gnu/test_pkg_config.py b/test/functional/toolchains/gnu/test_pkg_config.py
similarity index 100%
rename from conans/test/functional/toolchains/gnu/test_pkg_config.py
rename to test/functional/toolchains/gnu/test_pkg_config.py
diff --git a/conans/test/functional/toolchains/gnu/test_pkgconfigdeps.py b/test/functional/toolchains/gnu/test_pkgconfigdeps.py
similarity index 100%
rename from conans/test/functional/toolchains/gnu/test_pkgconfigdeps.py
rename to test/functional/toolchains/gnu/test_pkgconfigdeps.py
diff --git a/conans/test/functional/toolchains/gnu/test_pkgconfigdeps_autotools.py b/test/functional/toolchains/gnu/test_pkgconfigdeps_autotools.py
similarity index 100%
rename from conans/test/functional/toolchains/gnu/test_pkgconfigdeps_autotools.py
rename to test/functional/toolchains/gnu/test_pkgconfigdeps_autotools.py
diff --git a/conans/test/functional/toolchains/gnu/test_v2_autotools_template.py b/test/functional/toolchains/gnu/test_v2_autotools_template.py
similarity index 100%
rename from conans/test/functional/toolchains/gnu/test_v2_autotools_template.py
rename to test/functional/toolchains/gnu/test_v2_autotools_template.py
diff --git a/conans/test/functional/toolchains/ios/__init__.py b/test/functional/toolchains/google/__init__.py
similarity index 100%
rename from conans/test/functional/toolchains/ios/__init__.py
rename to test/functional/toolchains/google/__init__.py
diff --git a/conans/test/functional/toolchains/google/test_bazel.py b/test/functional/toolchains/google/test_bazel.py
similarity index 100%
rename from conans/test/functional/toolchains/google/test_bazel.py
rename to test/functional/toolchains/google/test_bazel.py
diff --git a/conans/test/functional/toolchains/google/test_bazeltoolchain_cross_compilation.py b/test/functional/toolchains/google/test_bazeltoolchain_cross_compilation.py
similarity index 100%
rename from conans/test/functional/toolchains/google/test_bazeltoolchain_cross_compilation.py
rename to test/functional/toolchains/google/test_bazeltoolchain_cross_compilation.py
diff --git a/conans/test/functional/toolchains/meson/__init__.py b/test/functional/toolchains/intel/__init__.py
similarity index 100%
rename from conans/test/functional/toolchains/meson/__init__.py
rename to test/functional/toolchains/intel/__init__.py
diff --git a/conans/test/functional/toolchains/intel/test_intel_cc.py b/test/functional/toolchains/intel/test_intel_cc.py
similarity index 100%
rename from conans/test/functional/toolchains/intel/test_intel_cc.py
rename to test/functional/toolchains/intel/test_intel_cc.py
diff --git a/conans/test/functional/toolchains/intel/test_using_msbuild.py b/test/functional/toolchains/intel/test_using_msbuild.py
similarity index 100%
rename from conans/test/functional/toolchains/intel/test_using_msbuild.py
rename to test/functional/toolchains/intel/test_using_msbuild.py
diff --git a/conans/test/functional/toolchains/microsoft/__init__.py b/test/functional/toolchains/ios/__init__.py
similarity index 100%
rename from conans/test/functional/toolchains/microsoft/__init__.py
rename to test/functional/toolchains/ios/__init__.py
diff --git a/conans/test/functional/toolchains/ios/_utils.py b/test/functional/toolchains/ios/_utils.py
similarity index 100%
rename from conans/test/functional/toolchains/ios/_utils.py
rename to test/functional/toolchains/ios/_utils.py
diff --git a/conans/test/functional/toolchains/ios/test_using_cmake.py b/test/functional/toolchains/ios/test_using_cmake.py
similarity index 100%
rename from conans/test/functional/toolchains/ios/test_using_cmake.py
rename to test/functional/toolchains/ios/test_using_cmake.py
diff --git a/conans/test/functional/tools/__init__.py b/test/functional/toolchains/meson/__init__.py
similarity index 100%
rename from conans/test/functional/tools/__init__.py
rename to test/functional/toolchains/meson/__init__.py
diff --git a/conans/test/functional/toolchains/meson/_base.py b/test/functional/toolchains/meson/_base.py
similarity index 100%
rename from conans/test/functional/toolchains/meson/_base.py
rename to test/functional/toolchains/meson/_base.py
diff --git a/conans/test/functional/toolchains/meson/test_backend.py b/test/functional/toolchains/meson/test_backend.py
similarity index 100%
rename from conans/test/functional/toolchains/meson/test_backend.py
rename to test/functional/toolchains/meson/test_backend.py
diff --git a/conans/test/functional/toolchains/meson/test_cross_compilation.py b/test/functional/toolchains/meson/test_cross_compilation.py
similarity index 100%
rename from conans/test/functional/toolchains/meson/test_cross_compilation.py
rename to test/functional/toolchains/meson/test_cross_compilation.py
diff --git a/conans/test/functional/toolchains/meson/test_install.py b/test/functional/toolchains/meson/test_install.py
similarity index 100%
rename from conans/test/functional/toolchains/meson/test_install.py
rename to test/functional/toolchains/meson/test_install.py
diff --git a/conans/test/functional/toolchains/meson/test_meson.py b/test/functional/toolchains/meson/test_meson.py
similarity index 100%
rename from conans/test/functional/toolchains/meson/test_meson.py
rename to test/functional/toolchains/meson/test_meson.py
diff --git a/conans/test/functional/toolchains/meson/test_meson_and_gnu_deps_flags.py b/test/functional/toolchains/meson/test_meson_and_gnu_deps_flags.py
similarity index 100%
rename from conans/test/functional/toolchains/meson/test_meson_and_gnu_deps_flags.py
rename to test/functional/toolchains/meson/test_meson_and_gnu_deps_flags.py
diff --git a/conans/test/functional/toolchains/meson/test_meson_and_objc.py b/test/functional/toolchains/meson/test_meson_and_objc.py
similarity index 100%
rename from conans/test/functional/toolchains/meson/test_meson_and_objc.py
rename to test/functional/toolchains/meson/test_meson_and_objc.py
diff --git a/conans/test/functional/toolchains/meson/test_meson_native_attribute.py b/test/functional/toolchains/meson/test_meson_native_attribute.py
similarity index 100%
rename from conans/test/functional/toolchains/meson/test_meson_native_attribute.py
rename to test/functional/toolchains/meson/test_meson_native_attribute.py
diff --git a/conans/test/functional/toolchains/meson/test_pkg_config_reuse.py b/test/functional/toolchains/meson/test_pkg_config_reuse.py
similarity index 100%
rename from conans/test/functional/toolchains/meson/test_pkg_config_reuse.py
rename to test/functional/toolchains/meson/test_pkg_config_reuse.py
diff --git a/conans/test/functional/toolchains/meson/test_preprocessor_definitions.py b/test/functional/toolchains/meson/test_preprocessor_definitions.py
similarity index 100%
rename from conans/test/functional/toolchains/meson/test_preprocessor_definitions.py
rename to test/functional/toolchains/meson/test_preprocessor_definitions.py
diff --git a/conans/test/functional/toolchains/meson/test_subproject.py b/test/functional/toolchains/meson/test_subproject.py
similarity index 100%
rename from conans/test/functional/toolchains/meson/test_subproject.py
rename to test/functional/toolchains/meson/test_subproject.py
diff --git a/conans/test/functional/toolchains/meson/test_test.py b/test/functional/toolchains/meson/test_test.py
similarity index 100%
rename from conans/test/functional/toolchains/meson/test_test.py
rename to test/functional/toolchains/meson/test_test.py
diff --git a/conans/test/functional/toolchains/meson/test_v2_meson_template.py b/test/functional/toolchains/meson/test_v2_meson_template.py
similarity index 100%
rename from conans/test/functional/toolchains/meson/test_v2_meson_template.py
rename to test/functional/toolchains/meson/test_v2_meson_template.py
diff --git a/conans/test/functional/tools/scm/__init__.py b/test/functional/toolchains/microsoft/__init__.py
similarity index 100%
rename from conans/test/functional/tools/scm/__init__.py
rename to test/functional/toolchains/microsoft/__init__.py
diff --git a/conans/test/functional/toolchains/microsoft/test_msbuild.py b/test/functional/toolchains/microsoft/test_msbuild.py
similarity index 100%
rename from conans/test/functional/toolchains/microsoft/test_msbuild.py
rename to test/functional/toolchains/microsoft/test_msbuild.py
diff --git a/conans/test/functional/toolchains/microsoft/test_msbuilddeps.py b/test/functional/toolchains/microsoft/test_msbuilddeps.py
similarity index 100%
rename from conans/test/functional/toolchains/microsoft/test_msbuilddeps.py
rename to test/functional/toolchains/microsoft/test_msbuilddeps.py
diff --git a/conans/test/functional/toolchains/microsoft/test_msbuilddeps_components.py b/test/functional/toolchains/microsoft/test_msbuilddeps_components.py
similarity index 100%
rename from conans/test/functional/toolchains/microsoft/test_msbuilddeps_components.py
rename to test/functional/toolchains/microsoft/test_msbuilddeps_components.py
diff --git a/conans/test/functional/toolchains/microsoft/test_msbuilddeps_traits.py b/test/functional/toolchains/microsoft/test_msbuilddeps_traits.py
similarity index 100%
rename from conans/test/functional/toolchains/microsoft/test_msbuilddeps_traits.py
rename to test/functional/toolchains/microsoft/test_msbuilddeps_traits.py
diff --git a/conans/test/functional/toolchains/microsoft/test_msbuildtoolchain.py b/test/functional/toolchains/microsoft/test_msbuildtoolchain.py
similarity index 100%
rename from conans/test/functional/toolchains/microsoft/test_msbuildtoolchain.py
rename to test/functional/toolchains/microsoft/test_msbuildtoolchain.py
diff --git a/conans/test/functional/toolchains/microsoft/test_v2_msbuild_template.py b/test/functional/toolchains/microsoft/test_v2_msbuild_template.py
similarity index 100%
rename from conans/test/functional/toolchains/microsoft/test_v2_msbuild_template.py
rename to test/functional/toolchains/microsoft/test_v2_msbuild_template.py
diff --git a/conans/test/functional/toolchains/scons/test_sconsdeps.py b/test/functional/toolchains/scons/test_sconsdeps.py
similarity index 100%
rename from conans/test/functional/toolchains/scons/test_sconsdeps.py
rename to test/functional/toolchains/scons/test_sconsdeps.py
diff --git a/conans/test/functional/toolchains/test_basic.py b/test/functional/toolchains/test_basic.py
similarity index 100%
rename from conans/test/functional/toolchains/test_basic.py
rename to test/functional/toolchains/test_basic.py
diff --git a/conans/test/functional/toolchains/test_msbuild_toolchain.py b/test/functional/toolchains/test_msbuild_toolchain.py
similarity index 100%
rename from conans/test/functional/toolchains/test_msbuild_toolchain.py
rename to test/functional/toolchains/test_msbuild_toolchain.py
diff --git a/conans/test/functional/toolchains/test_nmake_toolchain.py b/test/functional/toolchains/test_nmake_toolchain.py
similarity index 100%
rename from conans/test/functional/toolchains/test_nmake_toolchain.py
rename to test/functional/toolchains/test_nmake_toolchain.py
diff --git a/conans/test/functional/toolchains/test_txt_cmdline.py b/test/functional/toolchains/test_txt_cmdline.py
similarity index 100%
rename from conans/test/functional/toolchains/test_txt_cmdline.py
rename to test/functional/toolchains/test_txt_cmdline.py
diff --git a/conans/test/functional/tools/system/__init__.py b/test/functional/tools/__init__.py
similarity index 100%
rename from conans/test/functional/tools/system/__init__.py
rename to test/functional/tools/__init__.py
diff --git a/conans/test/functional/util/__init__.py b/test/functional/tools/scm/__init__.py
similarity index 100%
rename from conans/test/functional/util/__init__.py
rename to test/functional/tools/scm/__init__.py
diff --git a/conans/test/functional/tools/scm/test_git.py b/test/functional/tools/scm/test_git.py
similarity index 100%
rename from conans/test/functional/tools/scm/test_git.py
rename to test/functional/tools/scm/test_git.py
diff --git a/conans/test/functional/tools/scm/test_git_get_commit.py b/test/functional/tools/scm/test_git_get_commit.py
similarity index 100%
rename from conans/test/functional/tools/scm/test_git_get_commit.py
rename to test/functional/tools/scm/test_git_get_commit.py
diff --git a/conans/test/functional/tools/scm/test_version.py b/test/functional/tools/scm/test_version.py
similarity index 100%
rename from conans/test/functional/tools/scm/test_version.py
rename to test/functional/tools/scm/test_version.py
diff --git a/conans/test/integration/__init__.py b/test/functional/tools/system/__init__.py
similarity index 100%
rename from conans/test/integration/__init__.py
rename to test/functional/tools/system/__init__.py
diff --git a/conans/test/functional/tools/system/package_manager_test.py b/test/functional/tools/system/package_manager_test.py
similarity index 100%
rename from conans/test/functional/tools/system/package_manager_test.py
rename to test/functional/tools/system/package_manager_test.py
diff --git a/conans/test/functional/tools/test_apple_tools.py b/test/functional/tools/test_apple_tools.py
similarity index 100%
rename from conans/test/functional/tools/test_apple_tools.py
rename to test/functional/tools/test_apple_tools.py
diff --git a/conans/test/functional/tools/test_files.py b/test/functional/tools/test_files.py
similarity index 100%
rename from conans/test/functional/tools/test_files.py
rename to test/functional/tools/test_files.py
diff --git a/conans/test/functional/tools_versions_test.py b/test/functional/tools_versions_test.py
similarity index 100%
rename from conans/test/functional/tools_versions_test.py
rename to test/functional/tools_versions_test.py
diff --git a/conans/test/integration/build_requires/__init__.py b/test/functional/util/__init__.py
similarity index 100%
rename from conans/test/integration/build_requires/__init__.py
rename to test/functional/util/__init__.py
diff --git a/conans/test/functional/util/test_cmd_args_to_string.py b/test/functional/util/test_cmd_args_to_string.py
similarity index 100%
rename from conans/test/functional/util/test_cmd_args_to_string.py
rename to test/functional/util/test_cmd_args_to_string.py
diff --git a/conans/test/functional/util/tools_test.py b/test/functional/util/tools_test.py
similarity index 100%
rename from conans/test/functional/util/tools_test.py
rename to test/functional/util/tools_test.py
diff --git a/conans/test/functional/utils.py b/test/functional/utils.py
similarity index 100%
rename from conans/test/functional/utils.py
rename to test/functional/utils.py
diff --git a/conans/test/integration/cache/__init__.py b/test/integration/__init__.py
similarity index 100%
rename from conans/test/integration/cache/__init__.py
rename to test/integration/__init__.py
diff --git a/conans/test/integration/command/__init__.py b/test/integration/build_requires/__init__.py
similarity index 100%
rename from conans/test/integration/command/__init__.py
rename to test/integration/build_requires/__init__.py
diff --git a/conans/test/integration/build_requires/build_requires_test.py b/test/integration/build_requires/build_requires_test.py
similarity index 100%
rename from conans/test/integration/build_requires/build_requires_test.py
rename to test/integration/build_requires/build_requires_test.py
diff --git a/conans/test/integration/build_requires/profile_build_requires_test.py b/test/integration/build_requires/profile_build_requires_test.py
similarity index 100%
rename from conans/test/integration/build_requires/profile_build_requires_test.py
rename to test/integration/build_requires/profile_build_requires_test.py
diff --git a/conans/test/integration/build_requires/test_build_requires_source_method.py b/test/integration/build_requires/test_build_requires_source_method.py
similarity index 100%
rename from conans/test/integration/build_requires/test_build_requires_source_method.py
rename to test/integration/build_requires/test_build_requires_source_method.py
diff --git a/conans/test/integration/build_requires/test_install_test_build_require.py b/test/integration/build_requires/test_install_test_build_require.py
similarity index 100%
rename from conans/test/integration/build_requires/test_install_test_build_require.py
rename to test/integration/build_requires/test_install_test_build_require.py
diff --git a/conans/test/integration/build_requires/test_relocatable_toolchain.py b/test/integration/build_requires/test_relocatable_toolchain.py
similarity index 100%
rename from conans/test/integration/build_requires/test_relocatable_toolchain.py
rename to test/integration/build_requires/test_relocatable_toolchain.py
diff --git a/conans/test/integration/build_requires/test_toolchain_packages.py b/test/integration/build_requires/test_toolchain_packages.py
similarity index 100%
rename from conans/test/integration/build_requires/test_toolchain_packages.py
rename to test/integration/build_requires/test_toolchain_packages.py
diff --git a/conans/test/integration/command/download/__init__.py b/test/integration/cache/__init__.py
similarity index 100%
rename from conans/test/integration/command/download/__init__.py
rename to test/integration/cache/__init__.py
diff --git a/conans/test/integration/cache/backup_sources_test.py b/test/integration/cache/backup_sources_test.py
similarity index 100%
rename from conans/test/integration/cache/backup_sources_test.py
rename to test/integration/cache/backup_sources_test.py
diff --git a/conans/test/integration/cache/cache2_update_test.py b/test/integration/cache/cache2_update_test.py
similarity index 100%
rename from conans/test/integration/cache/cache2_update_test.py
rename to test/integration/cache/cache2_update_test.py
diff --git a/conans/test/integration/cache/download_cache_test.py b/test/integration/cache/download_cache_test.py
similarity index 100%
rename from conans/test/integration/cache/download_cache_test.py
rename to test/integration/cache/download_cache_test.py
diff --git a/conans/test/integration/cache/rmdir_fail_test.py b/test/integration/cache/rmdir_fail_test.py
similarity index 100%
rename from conans/test/integration/cache/rmdir_fail_test.py
rename to test/integration/cache/rmdir_fail_test.py
diff --git a/conans/test/integration/cache/storage_path_test.py b/test/integration/cache/storage_path_test.py
similarity index 100%
rename from conans/test/integration/cache/storage_path_test.py
rename to test/integration/cache/storage_path_test.py
diff --git a/conans/test/integration/cache/test_home_special_char.py b/test/integration/cache/test_home_special_char.py
similarity index 100%
rename from conans/test/integration/cache/test_home_special_char.py
rename to test/integration/cache/test_home_special_char.py
diff --git a/conans/test/integration/cache/test_package_revisions.py b/test/integration/cache/test_package_revisions.py
similarity index 100%
rename from conans/test/integration/cache/test_package_revisions.py
rename to test/integration/cache/test_package_revisions.py
diff --git a/conans/test/integration/cache/test_same_pref_removal.py b/test/integration/cache/test_same_pref_removal.py
similarity index 100%
rename from conans/test/integration/cache/test_same_pref_removal.py
rename to test/integration/cache/test_same_pref_removal.py
diff --git a/conans/test/integration/command/export/__init__.py b/test/integration/command/__init__.py
similarity index 100%
rename from conans/test/integration/command/export/__init__.py
rename to test/integration/command/__init__.py
diff --git a/conans/test/integration/command/alias_test.py b/test/integration/command/alias_test.py
similarity index 100%
rename from conans/test/integration/command/alias_test.py
rename to test/integration/command/alias_test.py
diff --git a/conans/test/integration/command/config_test.py b/test/integration/command/config_test.py
similarity index 100%
rename from conans/test/integration/command/config_test.py
rename to test/integration/command/config_test.py
diff --git a/conans/test/integration/command/create_test.py b/test/integration/command/create_test.py
similarity index 100%
rename from conans/test/integration/command/create_test.py
rename to test/integration/command/create_test.py
diff --git a/conans/test/integration/command/dockerfiles/Dockerfile b/test/integration/command/dockerfiles/Dockerfile
similarity index 100%
rename from conans/test/integration/command/dockerfiles/Dockerfile
rename to test/integration/command/dockerfiles/Dockerfile
diff --git a/conans/test/integration/command/dockerfiles/Dockerfile_args b/test/integration/command/dockerfiles/Dockerfile_args
similarity index 100%
rename from conans/test/integration/command/dockerfiles/Dockerfile_args
rename to test/integration/command/dockerfiles/Dockerfile_args
diff --git a/conans/test/integration/command/dockerfiles/Dockerfile_ninja b/test/integration/command/dockerfiles/Dockerfile_ninja
similarity index 100%
rename from conans/test/integration/command/dockerfiles/Dockerfile_ninja
rename to test/integration/command/dockerfiles/Dockerfile_ninja
diff --git a/conans/test/integration/command/dockerfiles/Dockerfile_profile_detect b/test/integration/command/dockerfiles/Dockerfile_profile_detect
similarity index 100%
rename from conans/test/integration/command/dockerfiles/Dockerfile_profile_detect
rename to test/integration/command/dockerfiles/Dockerfile_profile_detect
diff --git a/conans/test/integration/command/dockerfiles/Dockerfile_test b/test/integration/command/dockerfiles/Dockerfile_test
similarity index 100%
rename from conans/test/integration/command/dockerfiles/Dockerfile_test
rename to test/integration/command/dockerfiles/Dockerfile_test
diff --git a/conans/test/integration/command/info/__init__.py b/test/integration/command/download/__init__.py
similarity index 100%
rename from conans/test/integration/command/info/__init__.py
rename to test/integration/command/download/__init__.py
diff --git a/conans/test/integration/command/download/download_parallel_test.py b/test/integration/command/download/download_parallel_test.py
similarity index 100%
rename from conans/test/integration/command/download/download_parallel_test.py
rename to test/integration/command/download/download_parallel_test.py
diff --git a/conans/test/integration/command/download/download_selected_packages_test.py b/test/integration/command/download/download_selected_packages_test.py
similarity index 100%
rename from conans/test/integration/command/download/download_selected_packages_test.py
rename to test/integration/command/download/download_selected_packages_test.py
diff --git a/conans/test/integration/command/download/download_test.py b/test/integration/command/download/download_test.py
similarity index 100%
rename from conans/test/integration/command/download/download_test.py
rename to test/integration/command/download/download_test.py
diff --git a/conans/test/integration/command/download/test_download_patterns.py b/test/integration/command/download/test_download_patterns.py
similarity index 100%
rename from conans/test/integration/command/download/test_download_patterns.py
rename to test/integration/command/download/test_download_patterns.py
diff --git a/conans/test/integration/command/install/__init__.py b/test/integration/command/export/__init__.py
similarity index 100%
rename from conans/test/integration/command/install/__init__.py
rename to test/integration/command/export/__init__.py
diff --git a/conans/test/integration/command/export/export_dirty_test.py b/test/integration/command/export/export_dirty_test.py
similarity index 100%
rename from conans/test/integration/command/export/export_dirty_test.py
rename to test/integration/command/export/export_dirty_test.py
diff --git a/conans/test/integration/command/export/export_path_test.py b/test/integration/command/export/export_path_test.py
similarity index 100%
rename from conans/test/integration/command/export/export_path_test.py
rename to test/integration/command/export/export_path_test.py
diff --git a/conans/test/integration/command/export/export_test.py b/test/integration/command/export/export_test.py
similarity index 100%
rename from conans/test/integration/command/export/export_test.py
rename to test/integration/command/export/export_test.py
diff --git a/conans/test/integration/command/export/exports_method_test.py b/test/integration/command/export/exports_method_test.py
similarity index 100%
rename from conans/test/integration/command/export/exports_method_test.py
rename to test/integration/command/export/exports_method_test.py
diff --git a/conans/test/integration/command/export/test_export.py b/test/integration/command/export/test_export.py
similarity index 100%
rename from conans/test/integration/command/export/test_export.py
rename to test/integration/command/export/test_export.py
diff --git a/conans/test/integration/command/export_pkg_test.py b/test/integration/command/export_pkg_test.py
similarity index 100%
rename from conans/test/integration/command/export_pkg_test.py
rename to test/integration/command/export_pkg_test.py
diff --git a/conans/test/integration/command/help_test.py b/test/integration/command/help_test.py
similarity index 100%
rename from conans/test/integration/command/help_test.py
rename to test/integration/command/help_test.py
diff --git a/conans/test/integration/command/upload/__init__.py b/test/integration/command/info/__init__.py
similarity index 100%
rename from conans/test/integration/command/upload/__init__.py
rename to test/integration/command/info/__init__.py
diff --git a/conans/test/integration/command/info/info_options_test.py b/test/integration/command/info/info_options_test.py
similarity index 100%
rename from conans/test/integration/command/info/info_options_test.py
rename to test/integration/command/info/info_options_test.py
diff --git a/conans/test/integration/command/info/info_test.py b/test/integration/command/info/info_test.py
similarity index 100%
rename from conans/test/integration/command/info/info_test.py
rename to test/integration/command/info/info_test.py
diff --git a/conans/test/integration/command/info/test_graph_info_graphical.py b/test/integration/command/info/test_graph_info_graphical.py
similarity index 100%
rename from conans/test/integration/command/info/test_graph_info_graphical.py
rename to test/integration/command/info/test_graph_info_graphical.py
diff --git a/conans/test/integration/command/info/test_info_folders.py b/test/integration/command/info/test_info_folders.py
similarity index 100%
rename from conans/test/integration/command/info/test_info_folders.py
rename to test/integration/command/info/test_info_folders.py
diff --git a/conans/test/integration/command_v2/__init__.py b/test/integration/command/install/__init__.py
similarity index 100%
rename from conans/test/integration/command_v2/__init__.py
rename to test/integration/command/install/__init__.py
diff --git a/conans/test/integration/command/install/install_cascade_test.py b/test/integration/command/install/install_cascade_test.py
similarity index 100%
rename from conans/test/integration/command/install/install_cascade_test.py
rename to test/integration/command/install/install_cascade_test.py
diff --git a/conans/test/integration/command/install/install_missing_dep_test.py b/test/integration/command/install/install_missing_dep_test.py
similarity index 100%
rename from conans/test/integration/command/install/install_missing_dep_test.py
rename to test/integration/command/install/install_missing_dep_test.py
diff --git a/conans/test/integration/command/install/install_parallel_test.py b/test/integration/command/install/install_parallel_test.py
similarity index 100%
rename from conans/test/integration/command/install/install_parallel_test.py
rename to test/integration/command/install/install_parallel_test.py
diff --git a/conans/test/integration/command/install/install_test.py b/test/integration/command/install/install_test.py
similarity index 100%
rename from conans/test/integration/command/install/install_test.py
rename to test/integration/command/install/install_test.py
diff --git a/conans/test/integration/command/install/install_update_test.py b/test/integration/command/install/install_update_test.py
similarity index 100%
rename from conans/test/integration/command/install/install_update_test.py
rename to test/integration/command/install/install_update_test.py
diff --git a/conans/test/integration/command/install/test_install_transitive.py b/test/integration/command/install/test_install_transitive.py
similarity index 100%
rename from conans/test/integration/command/install/test_install_transitive.py
rename to test/integration/command/install/test_install_transitive.py
diff --git a/conans/test/integration/command/new_test.py b/test/integration/command/new_test.py
similarity index 100%
rename from conans/test/integration/command/new_test.py
rename to test/integration/command/new_test.py
diff --git a/conans/test/integration/command/remote_test.py b/test/integration/command/remote_test.py
similarity index 100%
rename from conans/test/integration/command/remote_test.py
rename to test/integration/command/remote_test.py
diff --git a/conans/test/integration/command/remote_verify_ssl_test.py b/test/integration/command/remote_verify_ssl_test.py
similarity index 100%
rename from conans/test/integration/command/remote_verify_ssl_test.py
rename to test/integration/command/remote_verify_ssl_test.py
diff --git a/conans/test/integration/command/remove_empty_dirs_test.py b/test/integration/command/remove_empty_dirs_test.py
similarity index 100%
rename from conans/test/integration/command/remove_empty_dirs_test.py
rename to test/integration/command/remove_empty_dirs_test.py
diff --git a/conans/test/integration/command/remove_test.py b/test/integration/command/remove_test.py
similarity index 100%
rename from conans/test/integration/command/remove_test.py
rename to test/integration/command/remove_test.py
diff --git a/conans/test/integration/command/runner_test.py b/test/integration/command/runner_test.py
similarity index 100%
rename from conans/test/integration/command/runner_test.py
rename to test/integration/command/runner_test.py
diff --git a/conans/test/integration/command/source_test.py b/test/integration/command/source_test.py
similarity index 100%
rename from conans/test/integration/command/source_test.py
rename to test/integration/command/source_test.py
diff --git a/conans/test/integration/command/test_build.py b/test/integration/command/test_build.py
similarity index 100%
rename from conans/test/integration/command/test_build.py
rename to test/integration/command/test_build.py
diff --git a/conans/test/integration/command/test_forced_download_source.py b/test/integration/command/test_forced_download_source.py
similarity index 100%
rename from conans/test/integration/command/test_forced_download_source.py
rename to test/integration/command/test_forced_download_source.py
diff --git a/conans/test/integration/command/test_package_test.py b/test/integration/command/test_package_test.py
similarity index 100%
rename from conans/test/integration/command/test_package_test.py
rename to test/integration/command/test_package_test.py
diff --git a/conans/test/integration/command/test_profile.py b/test/integration/command/test_profile.py
similarity index 100%
rename from conans/test/integration/command/test_profile.py
rename to test/integration/command/test_profile.py
diff --git a/conans/test/integration/conan_api/__init__.py b/test/integration/command/upload/__init__.py
similarity index 100%
rename from conans/test/integration/conan_api/__init__.py
rename to test/integration/command/upload/__init__.py
diff --git a/conans/test/integration/command/upload/syncronize_test.py b/test/integration/command/upload/syncronize_test.py
similarity index 100%
rename from conans/test/integration/command/upload/syncronize_test.py
rename to test/integration/command/upload/syncronize_test.py
diff --git a/conans/test/integration/command/upload/test_upload_bundle.py b/test/integration/command/upload/test_upload_bundle.py
similarity index 100%
rename from conans/test/integration/command/upload/test_upload_bundle.py
rename to test/integration/command/upload/test_upload_bundle.py
diff --git a/conans/test/integration/command/upload/test_upload_parallel.py b/test/integration/command/upload/test_upload_parallel.py
similarity index 100%
rename from conans/test/integration/command/upload/test_upload_parallel.py
rename to test/integration/command/upload/test_upload_parallel.py
diff --git a/conans/test/integration/command/upload/test_upload_patterns.py b/test/integration/command/upload/test_upload_patterns.py
similarity index 100%
rename from conans/test/integration/command/upload/test_upload_patterns.py
rename to test/integration/command/upload/test_upload_patterns.py
diff --git a/conans/test/integration/command/upload/upload_complete_test.py b/test/integration/command/upload/upload_complete_test.py
similarity index 100%
rename from conans/test/integration/command/upload/upload_complete_test.py
rename to test/integration/command/upload/upload_complete_test.py
diff --git a/conans/test/integration/command/upload/upload_compression_test.py b/test/integration/command/upload/upload_compression_test.py
similarity index 100%
rename from conans/test/integration/command/upload/upload_compression_test.py
rename to test/integration/command/upload/upload_compression_test.py
diff --git a/conans/test/integration/command/upload/upload_test.py b/test/integration/command/upload/upload_test.py
similarity index 100%
rename from conans/test/integration/command/upload/upload_test.py
rename to test/integration/command/upload/upload_test.py
diff --git a/conans/test/integration/command/user_test.py b/test/integration/command/user_test.py
similarity index 100%
rename from conans/test/integration/command/user_test.py
rename to test/integration/command/user_test.py
diff --git a/conans/test/integration/conan_v2/__init__.py b/test/integration/command_v2/__init__.py
similarity index 100%
rename from conans/test/integration/conan_v2/__init__.py
rename to test/integration/command_v2/__init__.py
diff --git a/conans/test/integration/command_v2/custom_commands_test.py b/test/integration/command_v2/custom_commands_test.py
similarity index 100%
rename from conans/test/integration/command_v2/custom_commands_test.py
rename to test/integration/command_v2/custom_commands_test.py
diff --git a/conans/test/integration/command_v2/help_test.py b/test/integration/command_v2/help_test.py
similarity index 100%
rename from conans/test/integration/command_v2/help_test.py
rename to test/integration/command_v2/help_test.py
diff --git a/conans/test/integration/command_v2/list_test.py b/test/integration/command_v2/list_test.py
similarity index 100%
rename from conans/test/integration/command_v2/list_test.py
rename to test/integration/command_v2/list_test.py
diff --git a/conans/test/integration/command_v2/search_test.py b/test/integration/command_v2/search_test.py
similarity index 100%
rename from conans/test/integration/command_v2/search_test.py
rename to test/integration/command_v2/search_test.py
diff --git a/conans/test/integration/command_v2/test_cache_clean.py b/test/integration/command_v2/test_cache_clean.py
similarity index 100%
rename from conans/test/integration/command_v2/test_cache_clean.py
rename to test/integration/command_v2/test_cache_clean.py
diff --git a/conans/test/integration/command_v2/test_cache_integrity.py b/test/integration/command_v2/test_cache_integrity.py
similarity index 100%
rename from conans/test/integration/command_v2/test_cache_integrity.py
rename to test/integration/command_v2/test_cache_integrity.py
diff --git a/conans/test/integration/command_v2/test_cache_path.py b/test/integration/command_v2/test_cache_path.py
similarity index 100%
rename from conans/test/integration/command_v2/test_cache_path.py
rename to test/integration/command_v2/test_cache_path.py
diff --git a/conans/test/integration/command_v2/test_cache_save_restore.py b/test/integration/command_v2/test_cache_save_restore.py
similarity index 100%
rename from conans/test/integration/command_v2/test_cache_save_restore.py
rename to test/integration/command_v2/test_cache_save_restore.py
diff --git a/conans/test/integration/command_v2/test_combined_pkglist_flows.py b/test/integration/command_v2/test_combined_pkglist_flows.py
similarity index 100%
rename from conans/test/integration/command_v2/test_combined_pkglist_flows.py
rename to test/integration/command_v2/test_combined_pkglist_flows.py
diff --git a/conans/test/integration/command_v2/test_graph_find_binaries.py b/test/integration/command_v2/test_graph_find_binaries.py
similarity index 100%
rename from conans/test/integration/command_v2/test_graph_find_binaries.py
rename to test/integration/command_v2/test_graph_find_binaries.py
diff --git a/conans/test/integration/command_v2/test_info_build_order.py b/test/integration/command_v2/test_info_build_order.py
similarity index 100%
rename from conans/test/integration/command_v2/test_info_build_order.py
rename to test/integration/command_v2/test_info_build_order.py
diff --git a/conans/test/integration/command_v2/test_inspect.py b/test/integration/command_v2/test_inspect.py
similarity index 100%
rename from conans/test/integration/command_v2/test_inspect.py
rename to test/integration/command_v2/test_inspect.py
diff --git a/conans/test/integration/command_v2/test_list_lru.py b/test/integration/command_v2/test_list_lru.py
similarity index 100%
rename from conans/test/integration/command_v2/test_list_lru.py
rename to test/integration/command_v2/test_list_lru.py
diff --git a/conans/test/integration/command_v2/test_outdated.py b/test/integration/command_v2/test_outdated.py
similarity index 100%
rename from conans/test/integration/command_v2/test_outdated.py
rename to test/integration/command_v2/test_outdated.py
diff --git a/conans/test/integration/command_v2/test_output.py b/test/integration/command_v2/test_output.py
similarity index 100%
rename from conans/test/integration/command_v2/test_output.py
rename to test/integration/command_v2/test_output.py
diff --git a/conans/test/integration/command_v2/test_version.py b/test/integration/command_v2/test_version.py
similarity index 100%
rename from conans/test/integration/command_v2/test_version.py
rename to test/integration/command_v2/test_version.py
diff --git a/conans/test/integration/conanfile/__init__.py b/test/integration/conan_api/__init__.py
similarity index 100%
rename from conans/test/integration/conanfile/__init__.py
rename to test/integration/conan_api/__init__.py
diff --git a/conans/test/integration/conan_api/list_test.py b/test/integration/conan_api/list_test.py
similarity index 100%
rename from conans/test/integration/conan_api/list_test.py
rename to test/integration/conan_api/list_test.py
diff --git a/conans/test/integration/conan_api/search_test.py b/test/integration/conan_api/search_test.py
similarity index 100%
rename from conans/test/integration/conan_api/search_test.py
rename to test/integration/conan_api/search_test.py
diff --git a/conans/test/integration/conan_api/test_cli.py b/test/integration/conan_api/test_cli.py
similarity index 100%
rename from conans/test/integration/conan_api/test_cli.py
rename to test/integration/conan_api/test_cli.py
diff --git a/conans/test/integration/configuration/__init__.py b/test/integration/conan_v2/__init__.py
similarity index 100%
rename from conans/test/integration/configuration/__init__.py
rename to test/integration/conan_v2/__init__.py
diff --git a/conans/test/integration/conan_v2/test_legacy_cpp_info.py b/test/integration/conan_v2/test_legacy_cpp_info.py
similarity index 100%
rename from conans/test/integration/conan_v2/test_legacy_cpp_info.py
rename to test/integration/conan_v2/test_legacy_cpp_info.py
diff --git a/conans/test/integration/configuration/conf/__init__.py b/test/integration/conanfile/__init__.py
similarity index 100%
rename from conans/test/integration/configuration/conf/__init__.py
rename to test/integration/conanfile/__init__.py
diff --git a/conans/test/integration/conanfile/conan_data_test.py b/test/integration/conanfile/conan_data_test.py
similarity index 100%
rename from conans/test/integration/conanfile/conan_data_test.py
rename to test/integration/conanfile/conan_data_test.py
diff --git a/conans/test/integration/conanfile/conanfile_errors_test.py b/test/integration/conanfile/conanfile_errors_test.py
similarity index 100%
rename from conans/test/integration/conanfile/conanfile_errors_test.py
rename to test/integration/conanfile/conanfile_errors_test.py
diff --git a/conans/test/integration/conanfile/conanfile_helpers_test.py b/test/integration/conanfile/conanfile_helpers_test.py
similarity index 100%
rename from conans/test/integration/conanfile/conanfile_helpers_test.py
rename to test/integration/conanfile/conanfile_helpers_test.py
diff --git a/conans/test/integration/conanfile/files/.gitattributes b/test/integration/conanfile/files/.gitattributes
similarity index 100%
rename from conans/test/integration/conanfile/files/.gitattributes
rename to test/integration/conanfile/files/.gitattributes
diff --git a/conans/test/integration/conanfile/files/conanfile_utf16be_with_bom.txt b/test/integration/conanfile/files/conanfile_utf16be_with_bom.txt
similarity index 100%
rename from conans/test/integration/conanfile/files/conanfile_utf16be_with_bom.txt
rename to test/integration/conanfile/files/conanfile_utf16be_with_bom.txt
diff --git a/conans/test/integration/conanfile/files/conanfile_utf16le_with_bom.txt b/test/integration/conanfile/files/conanfile_utf16le_with_bom.txt
similarity index 100%
rename from conans/test/integration/conanfile/files/conanfile_utf16le_with_bom.txt
rename to test/integration/conanfile/files/conanfile_utf16le_with_bom.txt
diff --git a/conans/test/integration/conanfile/files/conanfile_utf8.txt b/test/integration/conanfile/files/conanfile_utf8.txt
similarity index 100%
rename from conans/test/integration/conanfile/files/conanfile_utf8.txt
rename to test/integration/conanfile/files/conanfile_utf8.txt
diff --git a/conans/test/integration/conanfile/files/conanfile_utf8_with_bom.txt b/test/integration/conanfile/files/conanfile_utf8_with_bom.txt
similarity index 100%
rename from conans/test/integration/conanfile/files/conanfile_utf8_with_bom.txt
rename to test/integration/conanfile/files/conanfile_utf8_with_bom.txt
diff --git a/conans/test/integration/conanfile/folders_access_test.py b/test/integration/conanfile/folders_access_test.py
similarity index 100%
rename from conans/test/integration/conanfile/folders_access_test.py
rename to test/integration/conanfile/folders_access_test.py
diff --git a/conans/test/integration/conanfile/generators_list_test.py b/test/integration/conanfile/generators_list_test.py
similarity index 100%
rename from conans/test/integration/conanfile/generators_list_test.py
rename to test/integration/conanfile/generators_list_test.py
diff --git a/conans/test/integration/conanfile/init_test.py b/test/integration/conanfile/init_test.py
similarity index 100%
rename from conans/test/integration/conanfile/init_test.py
rename to test/integration/conanfile/init_test.py
diff --git a/conans/test/integration/conanfile/invalid_configuration_test.py b/test/integration/conanfile/invalid_configuration_test.py
similarity index 100%
rename from conans/test/integration/conanfile/invalid_configuration_test.py
rename to test/integration/conanfile/invalid_configuration_test.py
diff --git a/conans/test/integration/conanfile/load_requires_file_test.py b/test/integration/conanfile/load_requires_file_test.py
similarity index 100%
rename from conans/test/integration/conanfile/load_requires_file_test.py
rename to test/integration/conanfile/load_requires_file_test.py
diff --git a/conans/test/integration/conanfile/no_copy_source_test.py b/test/integration/conanfile/no_copy_source_test.py
similarity index 100%
rename from conans/test/integration/conanfile/no_copy_source_test.py
rename to test/integration/conanfile/no_copy_source_test.py
diff --git a/conans/test/integration/conanfile/required_conan_version_test.py b/test/integration/conanfile/required_conan_version_test.py
similarity index 100%
rename from conans/test/integration/conanfile/required_conan_version_test.py
rename to test/integration/conanfile/required_conan_version_test.py
diff --git a/conans/test/integration/conanfile/same_userchannel_test.py b/test/integration/conanfile/same_userchannel_test.py
similarity index 100%
rename from conans/test/integration/conanfile/same_userchannel_test.py
rename to test/integration/conanfile/same_userchannel_test.py
diff --git a/conans/test/integration/conanfile/set_name_version_test.py b/test/integration/conanfile/set_name_version_test.py
similarity index 100%
rename from conans/test/integration/conanfile/set_name_version_test.py
rename to test/integration/conanfile/set_name_version_test.py
diff --git a/conans/test/integration/conanfile/test_attributes_scope.py b/test/integration/conanfile/test_attributes_scope.py
similarity index 100%
rename from conans/test/integration/conanfile/test_attributes_scope.py
rename to test/integration/conanfile/test_attributes_scope.py
diff --git a/conans/test/integration/conanfile/test_conanfile_txt_encodings.py b/test/integration/conanfile/test_conanfile_txt_encodings.py
similarity index 100%
rename from conans/test/integration/conanfile/test_conanfile_txt_encodings.py
rename to test/integration/conanfile/test_conanfile_txt_encodings.py
diff --git a/conans/test/integration/conanfile/test_conanfile_txt_test_requires.py b/test/integration/conanfile/test_conanfile_txt_test_requires.py
similarity index 100%
rename from conans/test/integration/conanfile/test_conanfile_txt_test_requires.py
rename to test/integration/conanfile/test_conanfile_txt_test_requires.py
diff --git a/conans/test/integration/conanfile/test_cpp_info_serialize.py b/test/integration/conanfile/test_cpp_info_serialize.py
similarity index 100%
rename from conans/test/integration/conanfile/test_cpp_info_serialize.py
rename to test/integration/conanfile/test_cpp_info_serialize.py
diff --git a/conans/test/integration/conanfile/test_deploy_method.py b/test/integration/conanfile/test_deploy_method.py
similarity index 100%
rename from conans/test/integration/conanfile/test_deploy_method.py
rename to test/integration/conanfile/test_deploy_method.py
diff --git a/conans/test/integration/conanfile/test_exception_printing.py b/test/integration/conanfile/test_exception_printing.py
similarity index 100%
rename from conans/test/integration/conanfile/test_exception_printing.py
rename to test/integration/conanfile/test_exception_printing.py
diff --git a/conans/test/integration/conanfile/test_print_in_conanfile.py b/test/integration/conanfile/test_print_in_conanfile.py
similarity index 100%
rename from conans/test/integration/conanfile/test_print_in_conanfile.py
rename to test/integration/conanfile/test_print_in_conanfile.py
diff --git a/conans/test/integration/conanfile/test_version_str.py b/test/integration/conanfile/test_version_str.py
similarity index 100%
rename from conans/test/integration/conanfile/test_version_str.py
rename to test/integration/conanfile/test_version_str.py
diff --git a/conans/test/integration/cross_building/__init__.py b/test/integration/configuration/__init__.py
similarity index 100%
rename from conans/test/integration/cross_building/__init__.py
rename to test/integration/configuration/__init__.py
diff --git a/conans/test/integration/configuration/client_certs_test.py b/test/integration/configuration/client_certs_test.py
similarity index 100%
rename from conans/test/integration/configuration/client_certs_test.py
rename to test/integration/configuration/client_certs_test.py
diff --git a/conans/test/integration/deprecated/__init__.py b/test/integration/configuration/conf/__init__.py
similarity index 100%
rename from conans/test/integration/deprecated/__init__.py
rename to test/integration/configuration/conf/__init__.py
diff --git a/conans/test/integration/configuration/conf/test_conf.py b/test/integration/configuration/conf/test_conf.py
similarity index 100%
rename from conans/test/integration/configuration/conf/test_conf.py
rename to test/integration/configuration/conf/test_conf.py
diff --git a/conans/test/integration/configuration/conf/test_conf_copy.py b/test/integration/configuration/conf/test_conf_copy.py
similarity index 100%
rename from conans/test/integration/configuration/conf/test_conf_copy.py
rename to test/integration/configuration/conf/test_conf_copy.py
diff --git a/conans/test/integration/configuration/conf/test_conf_from_br.py b/test/integration/configuration/conf/test_conf_from_br.py
similarity index 100%
rename from conans/test/integration/configuration/conf/test_conf_from_br.py
rename to test/integration/configuration/conf/test_conf_from_br.py
diff --git a/conans/test/integration/configuration/conf/test_conf_package_id.py b/test/integration/configuration/conf/test_conf_package_id.py
similarity index 100%
rename from conans/test/integration/configuration/conf/test_conf_package_id.py
rename to test/integration/configuration/conf/test_conf_package_id.py
diff --git a/conans/test/integration/configuration/conf/test_conf_profile.py b/test/integration/configuration/conf/test_conf_profile.py
similarity index 100%
rename from conans/test/integration/configuration/conf/test_conf_profile.py
rename to test/integration/configuration/conf/test_conf_profile.py
diff --git a/conans/test/integration/configuration/custom_setting_test_package_test.py b/test/integration/configuration/custom_setting_test_package_test.py
similarity index 100%
rename from conans/test/integration/configuration/custom_setting_test_package_test.py
rename to test/integration/configuration/custom_setting_test_package_test.py
diff --git a/conans/test/integration/configuration/default_profile_test.py b/test/integration/configuration/default_profile_test.py
similarity index 100%
rename from conans/test/integration/configuration/default_profile_test.py
rename to test/integration/configuration/default_profile_test.py
diff --git a/conans/test/integration/configuration/invalid_settings_test.py b/test/integration/configuration/invalid_settings_test.py
similarity index 100%
rename from conans/test/integration/configuration/invalid_settings_test.py
rename to test/integration/configuration/invalid_settings_test.py
diff --git a/conans/test/integration/configuration/profile_test.py b/test/integration/configuration/profile_test.py
similarity index 100%
rename from conans/test/integration/configuration/profile_test.py
rename to test/integration/configuration/profile_test.py
diff --git a/conans/test/integration/configuration/proxies_conf_test.py b/test/integration/configuration/proxies_conf_test.py
similarity index 100%
rename from conans/test/integration/configuration/proxies_conf_test.py
rename to test/integration/configuration/proxies_conf_test.py
diff --git a/conans/test/integration/configuration/python_version_test.py b/test/integration/configuration/python_version_test.py
similarity index 100%
rename from conans/test/integration/configuration/python_version_test.py
rename to test/integration/configuration/python_version_test.py
diff --git a/conans/test/integration/configuration/requester_test.py b/test/integration/configuration/requester_test.py
similarity index 100%
rename from conans/test/integration/configuration/requester_test.py
rename to test/integration/configuration/requester_test.py
diff --git a/conans/test/integration/configuration/required_version_test.py b/test/integration/configuration/required_version_test.py
similarity index 100%
rename from conans/test/integration/configuration/required_version_test.py
rename to test/integration/configuration/required_version_test.py
diff --git a/conans/test/integration/configuration/test_custom_symlinked_home.py b/test/integration/configuration/test_custom_symlinked_home.py
similarity index 100%
rename from conans/test/integration/configuration/test_custom_symlinked_home.py
rename to test/integration/configuration/test_custom_symlinked_home.py
diff --git a/conans/test/integration/configuration/test_profile_jinja.py b/test/integration/configuration/test_profile_jinja.py
similarity index 100%
rename from conans/test/integration/configuration/test_profile_jinja.py
rename to test/integration/configuration/test_profile_jinja.py
diff --git a/conans/test/integration/configuration/test_profile_plugin.py b/test/integration/configuration/test_profile_plugin.py
similarity index 100%
rename from conans/test/integration/configuration/test_profile_plugin.py
rename to test/integration/configuration/test_profile_plugin.py
diff --git a/conans/test/integration/configuration/test_profile_priority.py b/test/integration/configuration/test_profile_priority.py
similarity index 100%
rename from conans/test/integration/configuration/test_profile_priority.py
rename to test/integration/configuration/test_profile_priority.py
diff --git a/conans/test/integration/editable/__init__.py b/test/integration/cross_building/__init__.py
similarity index 100%
rename from conans/test/integration/editable/__init__.py
rename to test/integration/cross_building/__init__.py
diff --git a/conans/test/integration/cross_building/build_requires_from_profile_test.py b/test/integration/cross_building/build_requires_from_profile_test.py
similarity index 100%
rename from conans/test/integration/cross_building/build_requires_from_profile_test.py
rename to test/integration/cross_building/build_requires_from_profile_test.py
diff --git a/conans/test/integration/cross_building/test_cross_build_options.py b/test/integration/cross_building/test_cross_build_options.py
similarity index 100%
rename from conans/test/integration/cross_building/test_cross_build_options.py
rename to test/integration/cross_building/test_cross_build_options.py
diff --git a/conans/test/integration/cross_building/test_package_test.py b/test/integration/cross_building/test_package_test.py
similarity index 100%
rename from conans/test/integration/cross_building/test_package_test.py
rename to test/integration/cross_building/test_package_test.py
diff --git a/conans/test/integration/environment/__init__.py b/test/integration/deprecated/__init__.py
similarity index 100%
rename from conans/test/integration/environment/__init__.py
rename to test/integration/deprecated/__init__.py
diff --git a/conans/test/integration/deprecated/test_deprecated.py b/test/integration/deprecated/test_deprecated.py
similarity index 100%
rename from conans/test/integration/deprecated/test_deprecated.py
rename to test/integration/deprecated/test_deprecated.py
diff --git a/conans/test/integration/extensions/__init__.py b/test/integration/editable/__init__.py
similarity index 100%
rename from conans/test/integration/extensions/__init__.py
rename to test/integration/editable/__init__.py
diff --git a/conans/test/integration/editable/editable_add_test.py b/test/integration/editable/editable_add_test.py
similarity index 100%
rename from conans/test/integration/editable/editable_add_test.py
rename to test/integration/editable/editable_add_test.py
diff --git a/conans/test/integration/editable/editable_remove_test.py b/test/integration/editable/editable_remove_test.py
similarity index 100%
rename from conans/test/integration/editable/editable_remove_test.py
rename to test/integration/editable/editable_remove_test.py
diff --git a/conans/test/integration/editable/forbidden_commands_test.py b/test/integration/editable/forbidden_commands_test.py
similarity index 100%
rename from conans/test/integration/editable/forbidden_commands_test.py
rename to test/integration/editable/forbidden_commands_test.py
diff --git a/conans/test/integration/editable/test_editable_envvars.py b/test/integration/editable/test_editable_envvars.py
similarity index 100%
rename from conans/test/integration/editable/test_editable_envvars.py
rename to test/integration/editable/test_editable_envvars.py
diff --git a/conans/test/integration/editable/test_editable_import.py b/test/integration/editable/test_editable_import.py
similarity index 100%
rename from conans/test/integration/editable/test_editable_import.py
rename to test/integration/editable/test_editable_import.py
diff --git a/conans/test/integration/editable/test_editable_layout.py b/test/integration/editable/test_editable_layout.py
similarity index 100%
rename from conans/test/integration/editable/test_editable_layout.py
rename to test/integration/editable/test_editable_layout.py
diff --git a/conans/test/integration/editable/test_editable_ranges.py b/test/integration/editable/test_editable_ranges.py
similarity index 100%
rename from conans/test/integration/editable/test_editable_ranges.py
rename to test/integration/editable/test_editable_ranges.py
diff --git a/conans/test/integration/editable/test_editables_layout.py b/test/integration/editable/test_editables_layout.py
similarity index 100%
rename from conans/test/integration/editable/test_editables_layout.py
rename to test/integration/editable/test_editables_layout.py
diff --git a/conans/test/integration/editable/transitive_editable_test.py b/test/integration/editable/transitive_editable_test.py
similarity index 100%
rename from conans/test/integration/editable/transitive_editable_test.py
rename to test/integration/editable/transitive_editable_test.py
diff --git a/conans/test/integration/generators/__init__.py b/test/integration/environment/__init__.py
similarity index 100%
rename from conans/test/integration/generators/__init__.py
rename to test/integration/environment/__init__.py
diff --git a/conans/test/integration/environment/test_buildenv_profile.py b/test/integration/environment/test_buildenv_profile.py
similarity index 100%
rename from conans/test/integration/environment/test_buildenv_profile.py
rename to test/integration/environment/test_buildenv_profile.py
diff --git a/conans/test/integration/environment/test_env.py b/test/integration/environment/test_env.py
similarity index 100%
rename from conans/test/integration/environment/test_env.py
rename to test/integration/environment/test_env.py
diff --git a/conans/test/integration/environment/test_runenv_profile.py b/test/integration/environment/test_runenv_profile.py
similarity index 100%
rename from conans/test/integration/environment/test_runenv_profile.py
rename to test/integration/environment/test_runenv_profile.py
diff --git a/conans/test/integration/export_sources_test.py b/test/integration/export_sources_test.py
similarity index 100%
rename from conans/test/integration/export_sources_test.py
rename to test/integration/export_sources_test.py
diff --git a/conans/test/integration/graph/__init__.py b/test/integration/extensions/__init__.py
similarity index 100%
rename from conans/test/integration/graph/__init__.py
rename to test/integration/extensions/__init__.py
diff --git a/conans/test/integration/extensions/test_cppstd_compat.py b/test/integration/extensions/test_cppstd_compat.py
similarity index 100%
rename from conans/test/integration/extensions/test_cppstd_compat.py
rename to test/integration/extensions/test_cppstd_compat.py
diff --git a/conans/test/integration/extensions/test_plugin_cmd_wrapper.py b/test/integration/extensions/test_plugin_cmd_wrapper.py
similarity index 100%
rename from conans/test/integration/extensions/test_plugin_cmd_wrapper.py
rename to test/integration/extensions/test_plugin_cmd_wrapper.py
diff --git a/conans/test/integration/extensions/test_profile_plugin.py b/test/integration/extensions/test_profile_plugin.py
similarity index 100%
rename from conans/test/integration/extensions/test_profile_plugin.py
rename to test/integration/extensions/test_profile_plugin.py
diff --git a/conans/test/integration/graph/core/__init__.py b/test/integration/generators/__init__.py
similarity index 100%
rename from conans/test/integration/graph/core/__init__.py
rename to test/integration/generators/__init__.py
diff --git a/conans/test/integration/generators/generators_test.py b/test/integration/generators/generators_test.py
similarity index 100%
rename from conans/test/integration/generators/generators_test.py
rename to test/integration/generators/generators_test.py
diff --git a/conans/test/integration/generators/order_libs_test.py b/test/integration/generators/order_libs_test.py
similarity index 100%
rename from conans/test/integration/generators/order_libs_test.py
rename to test/integration/generators/order_libs_test.py
diff --git a/conans/test/integration/generators/test_custom_global_generators.py b/test/integration/generators/test_custom_global_generators.py
similarity index 100%
rename from conans/test/integration/generators/test_custom_global_generators.py
rename to test/integration/generators/test_custom_global_generators.py
diff --git a/conans/test/integration/graph/ux/__init__.py b/test/integration/graph/__init__.py
similarity index 100%
rename from conans/test/integration/graph/ux/__init__.py
rename to test/integration/graph/__init__.py
diff --git a/conans/test/integration/graph/conflict_diamond_test.py b/test/integration/graph/conflict_diamond_test.py
similarity index 100%
rename from conans/test/integration/graph/conflict_diamond_test.py
rename to test/integration/graph/conflict_diamond_test.py
diff --git a/conans/test/integration/graph/version_ranges/__init__.py b/test/integration/graph/core/__init__.py
similarity index 100%
rename from conans/test/integration/graph/version_ranges/__init__.py
rename to test/integration/graph/core/__init__.py
diff --git a/conans/test/integration/graph/core/graph_manager_base.py b/test/integration/graph/core/graph_manager_base.py
similarity index 100%
rename from conans/test/integration/graph/core/graph_manager_base.py
rename to test/integration/graph/core/graph_manager_base.py
diff --git a/conans/test/integration/graph/core/graph_manager_test.py b/test/integration/graph/core/graph_manager_test.py
similarity index 100%
rename from conans/test/integration/graph/core/graph_manager_test.py
rename to test/integration/graph/core/graph_manager_test.py
diff --git a/conans/test/integration/graph/core/test_alias.py b/test/integration/graph/core/test_alias.py
similarity index 100%
rename from conans/test/integration/graph/core/test_alias.py
rename to test/integration/graph/core/test_alias.py
diff --git a/conans/test/integration/graph/core/test_auto_package_type.py b/test/integration/graph/core/test_auto_package_type.py
similarity index 100%
rename from conans/test/integration/graph/core/test_auto_package_type.py
rename to test/integration/graph/core/test_auto_package_type.py
diff --git a/conans/test/integration/graph/core/test_build_require_invalid.py b/test/integration/graph/core/test_build_require_invalid.py
similarity index 100%
rename from conans/test/integration/graph/core/test_build_require_invalid.py
rename to test/integration/graph/core/test_build_require_invalid.py
diff --git a/conans/test/integration/graph/core/test_build_requires.py b/test/integration/graph/core/test_build_requires.py
similarity index 100%
rename from conans/test/integration/graph/core/test_build_requires.py
rename to test/integration/graph/core/test_build_requires.py
diff --git a/conans/test/integration/graph/core/test_options.py b/test/integration/graph/core/test_options.py
similarity index 100%
rename from conans/test/integration/graph/core/test_options.py
rename to test/integration/graph/core/test_options.py
diff --git a/conans/test/integration/graph/core/test_provides.py b/test/integration/graph/core/test_provides.py
similarity index 100%
rename from conans/test/integration/graph/core/test_provides.py
rename to test/integration/graph/core/test_provides.py
diff --git a/conans/test/integration/graph/core/test_version_ranges.py b/test/integration/graph/core/test_version_ranges.py
similarity index 100%
rename from conans/test/integration/graph/core/test_version_ranges.py
rename to test/integration/graph/core/test_version_ranges.py
diff --git a/conans/test/integration/graph/require_override_test.py b/test/integration/graph/require_override_test.py
similarity index 100%
rename from conans/test/integration/graph/require_override_test.py
rename to test/integration/graph/require_override_test.py
diff --git a/conans/test/integration/graph/test_dependencies_visit.py b/test/integration/graph/test_dependencies_visit.py
similarity index 100%
rename from conans/test/integration/graph/test_dependencies_visit.py
rename to test/integration/graph/test_dependencies_visit.py
diff --git a/conans/test/integration/graph/test_platform_requires.py b/test/integration/graph/test_platform_requires.py
similarity index 100%
rename from conans/test/integration/graph/test_platform_requires.py
rename to test/integration/graph/test_platform_requires.py
diff --git a/conans/test/integration/graph/test_pure_runtime_dep.py b/test/integration/graph/test_pure_runtime_dep.py
similarity index 100%
rename from conans/test/integration/graph/test_pure_runtime_dep.py
rename to test/integration/graph/test_pure_runtime_dep.py
diff --git a/conans/test/integration/graph/test_remote_resolution.py b/test/integration/graph/test_remote_resolution.py
similarity index 100%
rename from conans/test/integration/graph/test_remote_resolution.py
rename to test/integration/graph/test_remote_resolution.py
diff --git a/conans/test/integration/graph/test_repackaging.py b/test/integration/graph/test_repackaging.py
similarity index 100%
rename from conans/test/integration/graph/test_repackaging.py
rename to test/integration/graph/test_repackaging.py
diff --git a/conans/test/integration/graph/test_replace_requires.py b/test/integration/graph/test_replace_requires.py
similarity index 100%
rename from conans/test/integration/graph/test_replace_requires.py
rename to test/integration/graph/test_replace_requires.py
diff --git a/conans/test/integration/graph/test_require_same_pkg_versions.py b/test/integration/graph/test_require_same_pkg_versions.py
similarity index 100%
rename from conans/test/integration/graph/test_require_same_pkg_versions.py
rename to test/integration/graph/test_require_same_pkg_versions.py
diff --git a/conans/test/integration/graph/test_skip_binaries.py b/test/integration/graph/test_skip_binaries.py
similarity index 100%
rename from conans/test/integration/graph/test_skip_binaries.py
rename to test/integration/graph/test_skip_binaries.py
diff --git a/conans/test/integration/graph/test_system_tools.py b/test/integration/graph/test_system_tools.py
similarity index 100%
rename from conans/test/integration/graph/test_system_tools.py
rename to test/integration/graph/test_system_tools.py
diff --git a/conans/test/integration/graph/test_test_requires.py b/test/integration/graph/test_test_requires.py
similarity index 100%
rename from conans/test/integration/graph/test_test_requires.py
rename to test/integration/graph/test_test_requires.py
diff --git a/conans/test/integration/graph/test_validate_build.py b/test/integration/graph/test_validate_build.py
similarity index 100%
rename from conans/test/integration/graph/test_validate_build.py
rename to test/integration/graph/test_validate_build.py
diff --git a/conans/test/integration/hooks/__init__.py b/test/integration/graph/ux/__init__.py
similarity index 100%
rename from conans/test/integration/hooks/__init__.py
rename to test/integration/graph/ux/__init__.py
diff --git a/conans/test/integration/graph/ux/loop_detection_test.py b/test/integration/graph/ux/loop_detection_test.py
similarity index 100%
rename from conans/test/integration/graph/ux/loop_detection_test.py
rename to test/integration/graph/ux/loop_detection_test.py
diff --git a/conans/test/integration/layout/__init__.py b/test/integration/graph/version_ranges/__init__.py
similarity index 100%
rename from conans/test/integration/layout/__init__.py
rename to test/integration/graph/version_ranges/__init__.py
diff --git a/conans/test/integration/graph/version_ranges/test_version_range_conf.py b/test/integration/graph/version_ranges/test_version_range_conf.py
similarity index 100%
rename from conans/test/integration/graph/version_ranges/test_version_range_conf.py
rename to test/integration/graph/version_ranges/test_version_range_conf.py
diff --git a/conans/test/integration/graph/version_ranges/version_range_override_test.py b/test/integration/graph/version_ranges/version_range_override_test.py
similarity index 100%
rename from conans/test/integration/graph/version_ranges/version_range_override_test.py
rename to test/integration/graph/version_ranges/version_range_override_test.py
diff --git a/conans/test/integration/graph/version_ranges/version_ranges_cached_test.py b/test/integration/graph/version_ranges/version_ranges_cached_test.py
similarity index 100%
rename from conans/test/integration/graph/version_ranges/version_ranges_cached_test.py
rename to test/integration/graph/version_ranges/version_ranges_cached_test.py
diff --git a/conans/test/integration/graph/version_ranges/version_ranges_diamond_test.py b/test/integration/graph/version_ranges/version_ranges_diamond_test.py
similarity index 100%
rename from conans/test/integration/graph/version_ranges/version_ranges_diamond_test.py
rename to test/integration/graph/version_ranges/version_ranges_diamond_test.py
diff --git a/conans/test/integration/lockfile/__init__.py b/test/integration/hooks/__init__.py
similarity index 100%
rename from conans/test/integration/lockfile/__init__.py
rename to test/integration/hooks/__init__.py
diff --git a/conans/test/integration/hooks/hook_test.py b/test/integration/hooks/hook_test.py
similarity index 100%
rename from conans/test/integration/hooks/hook_test.py
rename to test/integration/hooks/hook_test.py
diff --git a/conans/test/integration/hooks/test_post_export.py b/test/integration/hooks/test_post_export.py
similarity index 100%
rename from conans/test/integration/hooks/test_post_export.py
rename to test/integration/hooks/test_post_export.py
diff --git a/conans/test/integration/hooks/test_post_package.py b/test/integration/hooks/test_post_package.py
similarity index 100%
rename from conans/test/integration/hooks/test_post_package.py
rename to test/integration/hooks/test_post_package.py
diff --git a/conans/test/integration/metadata/__init__.py b/test/integration/layout/__init__.py
similarity index 100%
rename from conans/test/integration/metadata/__init__.py
rename to test/integration/layout/__init__.py
diff --git a/conans/test/integration/layout/export_folder_variable_test.py b/test/integration/layout/export_folder_variable_test.py
similarity index 100%
rename from conans/test/integration/layout/export_folder_variable_test.py
rename to test/integration/layout/export_folder_variable_test.py
diff --git a/conans/test/integration/layout/test_cmake_build_folder.py b/test/integration/layout/test_cmake_build_folder.py
similarity index 100%
rename from conans/test/integration/layout/test_cmake_build_folder.py
rename to test/integration/layout/test_cmake_build_folder.py
diff --git a/conans/test/integration/layout/test_layout_generate.py b/test/integration/layout/test_layout_generate.py
similarity index 100%
rename from conans/test/integration/layout/test_layout_generate.py
rename to test/integration/layout/test_layout_generate.py
diff --git a/conans/test/integration/layout/test_layout_paths.py b/test/integration/layout/test_layout_paths.py
similarity index 100%
rename from conans/test/integration/layout/test_layout_paths.py
rename to test/integration/layout/test_layout_paths.py
diff --git a/conans/test/integration/layout/test_legacy_cpp_info_and_layout.py b/test/integration/layout/test_legacy_cpp_info_and_layout.py
similarity index 100%
rename from conans/test/integration/layout/test_legacy_cpp_info_and_layout.py
rename to test/integration/layout/test_legacy_cpp_info_and_layout.py
diff --git a/conans/test/integration/options/__init__.py b/test/integration/lockfile/__init__.py
similarity index 100%
rename from conans/test/integration/options/__init__.py
rename to test/integration/lockfile/__init__.py
diff --git a/conans/test/integration/lockfile/test_ci.py b/test/integration/lockfile/test_ci.py
similarity index 100%
rename from conans/test/integration/lockfile/test_ci.py
rename to test/integration/lockfile/test_ci.py
diff --git a/conans/test/integration/lockfile/test_ci_overrides.py b/test/integration/lockfile/test_ci_overrides.py
similarity index 100%
rename from conans/test/integration/lockfile/test_ci_overrides.py
rename to test/integration/lockfile/test_ci_overrides.py
diff --git a/conans/test/integration/lockfile/test_ci_revisions.py b/test/integration/lockfile/test_ci_revisions.py
similarity index 100%
rename from conans/test/integration/lockfile/test_ci_revisions.py
rename to test/integration/lockfile/test_ci_revisions.py
diff --git a/conans/test/integration/lockfile/test_compatibility.py b/test/integration/lockfile/test_compatibility.py
similarity index 100%
rename from conans/test/integration/lockfile/test_compatibility.py
rename to test/integration/lockfile/test_compatibility.py
diff --git a/conans/test/integration/lockfile/test_graph_overrides.py b/test/integration/lockfile/test_graph_overrides.py
similarity index 100%
rename from conans/test/integration/lockfile/test_graph_overrides.py
rename to test/integration/lockfile/test_graph_overrides.py
diff --git a/conans/test/integration/lockfile/test_lock_alias.py b/test/integration/lockfile/test_lock_alias.py
similarity index 100%
rename from conans/test/integration/lockfile/test_lock_alias.py
rename to test/integration/lockfile/test_lock_alias.py
diff --git a/conans/test/integration/lockfile/test_lock_build_requires.py b/test/integration/lockfile/test_lock_build_requires.py
similarity index 100%
rename from conans/test/integration/lockfile/test_lock_build_requires.py
rename to test/integration/lockfile/test_lock_build_requires.py
diff --git a/conans/test/integration/lockfile/test_lock_merge.py b/test/integration/lockfile/test_lock_merge.py
similarity index 100%
rename from conans/test/integration/lockfile/test_lock_merge.py
rename to test/integration/lockfile/test_lock_merge.py
diff --git a/conans/test/integration/lockfile/test_lock_packages.py b/test/integration/lockfile/test_lock_packages.py
similarity index 100%
rename from conans/test/integration/lockfile/test_lock_packages.py
rename to test/integration/lockfile/test_lock_packages.py
diff --git a/conans/test/integration/lockfile/test_lock_pyrequires.py b/test/integration/lockfile/test_lock_pyrequires.py
similarity index 100%
rename from conans/test/integration/lockfile/test_lock_pyrequires.py
rename to test/integration/lockfile/test_lock_pyrequires.py
diff --git a/conans/test/integration/lockfile/test_lock_pyrequires_revisions.py b/test/integration/lockfile/test_lock_pyrequires_revisions.py
similarity index 100%
rename from conans/test/integration/lockfile/test_lock_pyrequires_revisions.py
rename to test/integration/lockfile/test_lock_pyrequires_revisions.py
diff --git a/conans/test/integration/lockfile/test_lock_requires.py b/test/integration/lockfile/test_lock_requires.py
similarity index 100%
rename from conans/test/integration/lockfile/test_lock_requires.py
rename to test/integration/lockfile/test_lock_requires.py
diff --git a/conans/test/integration/lockfile/test_lock_requires_revisions.py b/test/integration/lockfile/test_lock_requires_revisions.py
similarity index 100%
rename from conans/test/integration/lockfile/test_lock_requires_revisions.py
rename to test/integration/lockfile/test_lock_requires_revisions.py
diff --git a/conans/test/integration/lockfile/test_options.py b/test/integration/lockfile/test_options.py
similarity index 100%
rename from conans/test/integration/lockfile/test_options.py
rename to test/integration/lockfile/test_options.py
diff --git a/conans/test/integration/lockfile/test_user_overrides.py b/test/integration/lockfile/test_user_overrides.py
similarity index 100%
rename from conans/test/integration/lockfile/test_user_overrides.py
rename to test/integration/lockfile/test_user_overrides.py
diff --git a/conans/test/integration/package_id/__init__.py b/test/integration/metadata/__init__.py
similarity index 100%
rename from conans/test/integration/package_id/__init__.py
rename to test/integration/metadata/__init__.py
diff --git a/conans/test/integration/metadata/test_metadata_collect.py b/test/integration/metadata/test_metadata_collect.py
similarity index 100%
rename from conans/test/integration/metadata/test_metadata_collect.py
rename to test/integration/metadata/test_metadata_collect.py
diff --git a/conans/test/integration/metadata/test_metadata_commands.py b/test/integration/metadata/test_metadata_commands.py
similarity index 100%
rename from conans/test/integration/metadata/test_metadata_commands.py
rename to test/integration/metadata/test_metadata_commands.py
diff --git a/conans/test/integration/metadata/test_metadata_deploy.py b/test/integration/metadata/test_metadata_deploy.py
similarity index 100%
rename from conans/test/integration/metadata/test_metadata_deploy.py
rename to test/integration/metadata/test_metadata_deploy.py
diff --git a/conans/test/integration/metadata/test_metadata_logs.py b/test/integration/metadata/test_metadata_logs.py
similarity index 100%
rename from conans/test/integration/metadata/test_metadata_logs.py
rename to test/integration/metadata/test_metadata_logs.py
diff --git a/conans/test/integration/metadata/test_metadata_test_package.py b/test/integration/metadata/test_metadata_test_package.py
similarity index 100%
rename from conans/test/integration/metadata/test_metadata_test_package.py
rename to test/integration/metadata/test_metadata_test_package.py
diff --git a/conans/test/integration/py_requires/__init__.py b/test/integration/options/__init__.py
similarity index 100%
rename from conans/test/integration/py_requires/__init__.py
rename to test/integration/options/__init__.py
diff --git a/conans/test/integration/options/options_in_requirements_test.py b/test/integration/options/options_in_requirements_test.py
similarity index 100%
rename from conans/test/integration/options/options_in_requirements_test.py
rename to test/integration/options/options_in_requirements_test.py
diff --git a/conans/test/integration/options/options_test.py b/test/integration/options/options_test.py
similarity index 100%
rename from conans/test/integration/options/options_test.py
rename to test/integration/options/options_test.py
diff --git a/conans/test/integration/options/test_configure_options.py b/test/integration/options/test_configure_options.py
similarity index 100%
rename from conans/test/integration/options/test_configure_options.py
rename to test/integration/options/test_configure_options.py
diff --git a/conans/test/integration/options/test_options_build_requires.py b/test/integration/options/test_options_build_requires.py
similarity index 100%
rename from conans/test/integration/options/test_options_build_requires.py
rename to test/integration/options/test_options_build_requires.py
diff --git a/conans/test/integration/options/test_package_config_test.py b/test/integration/options/test_package_config_test.py
similarity index 100%
rename from conans/test/integration/options/test_package_config_test.py
rename to test/integration/options/test_package_config_test.py
diff --git a/conans/test/integration/remote/__init__.py b/test/integration/package_id/__init__.py
similarity index 100%
rename from conans/test/integration/remote/__init__.py
rename to test/integration/package_id/__init__.py
diff --git a/conans/test/integration/package_id/build_id_test.py b/test/integration/package_id/build_id_test.py
similarity index 100%
rename from conans/test/integration/package_id/build_id_test.py
rename to test/integration/package_id/build_id_test.py
diff --git a/conans/test/integration/package_id/compatible_test.py b/test/integration/package_id/compatible_test.py
similarity index 100%
rename from conans/test/integration/package_id/compatible_test.py
rename to test/integration/package_id/compatible_test.py
diff --git a/conans/test/integration/package_id/full_revision_mode_test.py b/test/integration/package_id/full_revision_mode_test.py
similarity index 100%
rename from conans/test/integration/package_id/full_revision_mode_test.py
rename to test/integration/package_id/full_revision_mode_test.py
diff --git a/conans/test/integration/package_id/package_id_and_confs_test.py b/test/integration/package_id/package_id_and_confs_test.py
similarity index 100%
rename from conans/test/integration/package_id/package_id_and_confs_test.py
rename to test/integration/package_id/package_id_and_confs_test.py
diff --git a/conans/test/integration/package_id/package_id_modes_test.py b/test/integration/package_id/package_id_modes_test.py
similarity index 100%
rename from conans/test/integration/package_id/package_id_modes_test.py
rename to test/integration/package_id/package_id_modes_test.py
diff --git a/conans/test/integration/package_id/package_id_requires_modes_test.py b/test/integration/package_id/package_id_requires_modes_test.py
similarity index 100%
rename from conans/test/integration/package_id/package_id_requires_modes_test.py
rename to test/integration/package_id/package_id_requires_modes_test.py
diff --git a/conans/test/integration/package_id/package_id_test.py b/test/integration/package_id/package_id_test.py
similarity index 100%
rename from conans/test/integration/package_id/package_id_test.py
rename to test/integration/package_id/package_id_test.py
diff --git a/conans/test/integration/package_id/python_requires_package_id_test.py b/test/integration/package_id/python_requires_package_id_test.py
similarity index 100%
rename from conans/test/integration/package_id/python_requires_package_id_test.py
rename to test/integration/package_id/python_requires_package_id_test.py
diff --git a/conans/test/integration/package_id/test_cache_compatibles.py b/test/integration/package_id/test_cache_compatibles.py
similarity index 100%
rename from conans/test/integration/package_id/test_cache_compatibles.py
rename to test/integration/package_id/test_cache_compatibles.py
diff --git a/conans/test/integration/package_id/test_config_package_id.py b/test/integration/package_id/test_config_package_id.py
similarity index 100%
rename from conans/test/integration/package_id/test_config_package_id.py
rename to test/integration/package_id/test_config_package_id.py
diff --git a/conans/test/integration/package_id/test_default_package_id.py b/test/integration/package_id/test_default_package_id.py
similarity index 100%
rename from conans/test/integration/package_id/test_default_package_id.py
rename to test/integration/package_id/test_default_package_id.py
diff --git a/conans/test/integration/package_id/test_package_id_test_requires.py b/test/integration/package_id/test_package_id_test_requires.py
similarity index 100%
rename from conans/test/integration/package_id/test_package_id_test_requires.py
rename to test/integration/package_id/test_package_id_test_requires.py
diff --git a/conans/test/integration/package_id/test_valid_package_id_values.py b/test/integration/package_id/test_valid_package_id_values.py
similarity index 100%
rename from conans/test/integration/package_id/test_valid_package_id_values.py
rename to test/integration/package_id/test_valid_package_id_values.py
diff --git a/conans/test/integration/package_id/test_validate.py b/test/integration/package_id/test_validate.py
similarity index 100%
rename from conans/test/integration/package_id/test_validate.py
rename to test/integration/package_id/test_validate.py
diff --git a/conans/test/integration/package_id/transitive_header_only_test.py b/test/integration/package_id/transitive_header_only_test.py
similarity index 100%
rename from conans/test/integration/package_id/transitive_header_only_test.py
rename to test/integration/package_id/transitive_header_only_test.py
diff --git a/conans/test/integration/package_id/transitive_options_affect_id_test.py b/test/integration/package_id/transitive_options_affect_id_test.py
similarity index 100%
rename from conans/test/integration/package_id/transitive_options_affect_id_test.py
rename to test/integration/package_id/transitive_options_affect_id_test.py
diff --git a/conans/test/integration/settings/__init__.py b/test/integration/py_requires/__init__.py
similarity index 100%
rename from conans/test/integration/settings/__init__.py
rename to test/integration/py_requires/__init__.py
diff --git a/conans/test/integration/py_requires/python_requires_test.py b/test/integration/py_requires/python_requires_test.py
similarity index 100%
rename from conans/test/integration/py_requires/python_requires_test.py
rename to test/integration/py_requires/python_requires_test.py
diff --git a/conans/test/integration/symlinks/__init__.py b/test/integration/remote/__init__.py
similarity index 100%
rename from conans/test/integration/symlinks/__init__.py
rename to test/integration/remote/__init__.py
diff --git a/conans/test/integration/remote/auth_bearer_test.py b/test/integration/remote/auth_bearer_test.py
similarity index 100%
rename from conans/test/integration/remote/auth_bearer_test.py
rename to test/integration/remote/auth_bearer_test.py
diff --git a/conans/test/integration/remote/auth_test.py b/test/integration/remote/auth_test.py
similarity index 100%
rename from conans/test/integration/remote/auth_test.py
rename to test/integration/remote/auth_test.py
diff --git a/conans/test/integration/remote/broken_download_test.py b/test/integration/remote/broken_download_test.py
similarity index 100%
rename from conans/test/integration/remote/broken_download_test.py
rename to test/integration/remote/broken_download_test.py
diff --git a/conans/test/integration/remote/download_retries_test.py b/test/integration/remote/download_retries_test.py
similarity index 100%
rename from conans/test/integration/remote/download_retries_test.py
rename to test/integration/remote/download_retries_test.py
diff --git a/conans/test/integration/remote/download_test.py b/test/integration/remote/download_test.py
similarity index 100%
rename from conans/test/integration/remote/download_test.py
rename to test/integration/remote/download_test.py
diff --git a/conans/test/integration/remote/multi_remote_checks_test.py b/test/integration/remote/multi_remote_checks_test.py
similarity index 100%
rename from conans/test/integration/remote/multi_remote_checks_test.py
rename to test/integration/remote/multi_remote_checks_test.py
diff --git a/conans/test/integration/remote/multi_remote_test.py b/test/integration/remote/multi_remote_test.py
similarity index 100%
rename from conans/test/integration/remote/multi_remote_test.py
rename to test/integration/remote/multi_remote_test.py
diff --git a/conans/test/integration/remote/requester_test.py b/test/integration/remote/requester_test.py
similarity index 100%
rename from conans/test/integration/remote/requester_test.py
rename to test/integration/remote/requester_test.py
diff --git a/conans/test/integration/remote/rest_api_test.py b/test/integration/remote/rest_api_test.py
similarity index 100%
rename from conans/test/integration/remote/rest_api_test.py
rename to test/integration/remote/rest_api_test.py
diff --git a/conans/test/integration/remote/retry_test.py b/test/integration/remote/retry_test.py
similarity index 100%
rename from conans/test/integration/remote/retry_test.py
rename to test/integration/remote/retry_test.py
diff --git a/conans/test/integration/remote/selected_remotes_test.py b/test/integration/remote/selected_remotes_test.py
similarity index 100%
rename from conans/test/integration/remote/selected_remotes_test.py
rename to test/integration/remote/selected_remotes_test.py
diff --git a/conans/test/integration/remote/server_error_test.py b/test/integration/remote/server_error_test.py
similarity index 100%
rename from conans/test/integration/remote/server_error_test.py
rename to test/integration/remote/server_error_test.py
diff --git a/conans/test/integration/remote/test_conaninfo_parsing.py b/test/integration/remote/test_conaninfo_parsing.py
similarity index 100%
rename from conans/test/integration/remote/test_conaninfo_parsing.py
rename to test/integration/remote/test_conaninfo_parsing.py
diff --git a/conans/test/integration/remote/test_local_recipes_index.py b/test/integration/remote/test_local_recipes_index.py
similarity index 100%
rename from conans/test/integration/remote/test_local_recipes_index.py
rename to test/integration/remote/test_local_recipes_index.py
diff --git a/conans/test/integration/remote/test_offline.py b/test/integration/remote/test_offline.py
similarity index 100%
rename from conans/test/integration/remote/test_offline.py
rename to test/integration/remote/test_offline.py
diff --git a/conans/test/integration/remote/test_remote_file_credentials.py b/test/integration/remote/test_remote_file_credentials.py
similarity index 100%
rename from conans/test/integration/remote/test_remote_file_credentials.py
rename to test/integration/remote/test_remote_file_credentials.py
diff --git a/conans/test/integration/remote/test_request_headers.py b/test/integration/remote/test_request_headers.py
similarity index 100%
rename from conans/test/integration/remote/test_request_headers.py
rename to test/integration/remote/test_request_headers.py
diff --git a/conans/test/integration/remote/token_refresh_test.py b/test/integration/remote/token_refresh_test.py
similarity index 100%
rename from conans/test/integration/remote/token_refresh_test.py
rename to test/integration/remote/token_refresh_test.py
diff --git a/conans/test/integration/toolchains/__init__.py b/test/integration/settings/__init__.py
similarity index 100%
rename from conans/test/integration/toolchains/__init__.py
rename to test/integration/settings/__init__.py
diff --git a/conans/test/integration/settings/built_type_setting_test.py b/test/integration/settings/built_type_setting_test.py
similarity index 100%
rename from conans/test/integration/settings/built_type_setting_test.py
rename to test/integration/settings/built_type_setting_test.py
diff --git a/conans/test/integration/settings/per_package_settings_test.py b/test/integration/settings/per_package_settings_test.py
similarity index 100%
rename from conans/test/integration/settings/per_package_settings_test.py
rename to test/integration/settings/per_package_settings_test.py
diff --git a/conans/test/integration/settings/remove_subsetting_test.py b/test/integration/settings/remove_subsetting_test.py
similarity index 100%
rename from conans/test/integration/settings/remove_subsetting_test.py
rename to test/integration/settings/remove_subsetting_test.py
diff --git a/conans/test/integration/settings/settings_override_test.py b/test/integration/settings/settings_override_test.py
similarity index 100%
rename from conans/test/integration/settings/settings_override_test.py
rename to test/integration/settings/settings_override_test.py
diff --git a/conans/test/integration/settings/test_disable_settings_assignment.py b/test/integration/settings/test_disable_settings_assignment.py
similarity index 100%
rename from conans/test/integration/settings/test_disable_settings_assignment.py
rename to test/integration/settings/test_disable_settings_assignment.py
diff --git a/conans/test/integration/settings/test_non_defining_settings.py b/test/integration/settings/test_non_defining_settings.py
similarity index 100%
rename from conans/test/integration/settings/test_non_defining_settings.py
rename to test/integration/settings/test_non_defining_settings.py
diff --git a/conans/test/integration/settings/test_settings_possible_values.py b/test/integration/settings/test_settings_possible_values.py
similarity index 100%
rename from conans/test/integration/settings/test_settings_possible_values.py
rename to test/integration/settings/test_settings_possible_values.py
diff --git a/conans/test/integration/settings/test_settings_user.py b/test/integration/settings/test_settings_user.py
similarity index 100%
rename from conans/test/integration/settings/test_settings_user.py
rename to test/integration/settings/test_settings_user.py
diff --git a/conans/test/integration/toolchains/apple/__init__.py b/test/integration/symlinks/__init__.py
similarity index 100%
rename from conans/test/integration/toolchains/apple/__init__.py
rename to test/integration/symlinks/__init__.py
diff --git a/conans/test/integration/symlinks/symlinks_test.py b/test/integration/symlinks/symlinks_test.py
similarity index 100%
rename from conans/test/integration/symlinks/symlinks_test.py
rename to test/integration/symlinks/symlinks_test.py
diff --git a/conans/test/integration/sysroot_test.py b/test/integration/sysroot_test.py
similarity index 100%
rename from conans/test/integration/sysroot_test.py
rename to test/integration/sysroot_test.py
diff --git a/conans/test/integration/system_reqs_test.py b/test/integration/system_reqs_test.py
similarity index 100%
rename from conans/test/integration/system_reqs_test.py
rename to test/integration/system_reqs_test.py
diff --git a/conans/test/integration/test_components.py b/test/integration/test_components.py
similarity index 100%
rename from conans/test/integration/test_components.py
rename to test/integration/test_components.py
diff --git a/conans/test/integration/test_components_error.py b/test/integration/test_components_error.py
similarity index 100%
rename from conans/test/integration/test_components_error.py
rename to test/integration/test_components_error.py
diff --git a/conans/test/integration/test_db_error.py b/test/integration/test_db_error.py
similarity index 100%
rename from conans/test/integration/test_db_error.py
rename to test/integration/test_db_error.py
diff --git a/conans/test/integration/test_migrations.py b/test/integration/test_migrations.py
similarity index 100%
rename from conans/test/integration/test_migrations.py
rename to test/integration/test_migrations.py
diff --git a/conans/test/integration/test_package_python_files.py b/test/integration/test_package_python_files.py
similarity index 100%
rename from conans/test/integration/test_package_python_files.py
rename to test/integration/test_package_python_files.py
diff --git a/conans/test/integration/test_pkg_signing.py b/test/integration/test_pkg_signing.py
similarity index 100%
rename from conans/test/integration/test_pkg_signing.py
rename to test/integration/test_pkg_signing.py
diff --git a/conans/test/integration/test_source_download_password.py b/test/integration/test_source_download_password.py
similarity index 100%
rename from conans/test/integration/test_source_download_password.py
rename to test/integration/test_source_download_password.py
diff --git a/conans/test/integration/test_timestamp_error.py b/test/integration/test_timestamp_error.py
similarity index 100%
rename from conans/test/integration/test_timestamp_error.py
rename to test/integration/test_timestamp_error.py
diff --git a/conans/test/integration/tgz_macos_dot_files_test.py b/test/integration/tgz_macos_dot_files_test.py
similarity index 100%
rename from conans/test/integration/tgz_macos_dot_files_test.py
rename to test/integration/tgz_macos_dot_files_test.py
diff --git a/conans/test/integration/toolchains/cmake/__init__.py b/test/integration/toolchains/__init__.py
similarity index 100%
rename from conans/test/integration/toolchains/cmake/__init__.py
rename to test/integration/toolchains/__init__.py
diff --git a/conans/test/integration/toolchains/cmake/cmakedeps/__init__.py b/test/integration/toolchains/apple/__init__.py
similarity index 100%
rename from conans/test/integration/toolchains/cmake/cmakedeps/__init__.py
rename to test/integration/toolchains/apple/__init__.py
diff --git a/conans/test/integration/toolchains/apple/test_xcodedeps.py b/test/integration/toolchains/apple/test_xcodedeps.py
similarity index 100%
rename from conans/test/integration/toolchains/apple/test_xcodedeps.py
rename to test/integration/toolchains/apple/test_xcodedeps.py
diff --git a/conans/test/integration/toolchains/apple/test_xcodetoolchain.py b/test/integration/toolchains/apple/test_xcodetoolchain.py
similarity index 100%
rename from conans/test/integration/toolchains/apple/test_xcodetoolchain.py
rename to test/integration/toolchains/apple/test_xcodetoolchain.py
diff --git a/conans/test/integration/toolchains/env/__init__.py b/test/integration/toolchains/cmake/__init__.py
similarity index 100%
rename from conans/test/integration/toolchains/env/__init__.py
rename to test/integration/toolchains/cmake/__init__.py
diff --git a/conans/test/integration/toolchains/gnu/__init__.py b/test/integration/toolchains/cmake/cmakedeps/__init__.py
similarity index 100%
rename from conans/test/integration/toolchains/gnu/__init__.py
rename to test/integration/toolchains/cmake/cmakedeps/__init__.py
diff --git a/conans/test/integration/toolchains/cmake/cmakedeps/test_cmakedeps.py b/test/integration/toolchains/cmake/cmakedeps/test_cmakedeps.py
similarity index 100%
rename from conans/test/integration/toolchains/cmake/cmakedeps/test_cmakedeps.py
rename to test/integration/toolchains/cmake/cmakedeps/test_cmakedeps.py
diff --git a/conans/test/integration/toolchains/cmake/cmakedeps/test_cmakedeps_find_module_and_config.py b/test/integration/toolchains/cmake/cmakedeps/test_cmakedeps_find_module_and_config.py
similarity index 100%
rename from conans/test/integration/toolchains/cmake/cmakedeps/test_cmakedeps_find_module_and_config.py
rename to test/integration/toolchains/cmake/cmakedeps/test_cmakedeps_find_module_and_config.py
diff --git a/conans/test/integration/toolchains/cmake/test_cmake.py b/test/integration/toolchains/cmake/test_cmake.py
similarity index 100%
rename from conans/test/integration/toolchains/cmake/test_cmake.py
rename to test/integration/toolchains/cmake/test_cmake.py
diff --git a/conans/test/integration/toolchains/cmake/test_cmaketoolchain.py b/test/integration/toolchains/cmake/test_cmaketoolchain.py
similarity index 100%
rename from conans/test/integration/toolchains/cmake/test_cmaketoolchain.py
rename to test/integration/toolchains/cmake/test_cmaketoolchain.py
diff --git a/conans/test/integration/toolchains/cmake/test_cmaketoolchain_blocks.py b/test/integration/toolchains/cmake/test_cmaketoolchain_blocks.py
similarity index 100%
rename from conans/test/integration/toolchains/cmake/test_cmaketoolchain_blocks.py
rename to test/integration/toolchains/cmake/test_cmaketoolchain_blocks.py
diff --git a/conans/test/integration/toolchains/google/__init__.py b/test/integration/toolchains/env/__init__.py
similarity index 100%
rename from conans/test/integration/toolchains/google/__init__.py
rename to test/integration/toolchains/env/__init__.py
diff --git a/conans/test/integration/toolchains/env/test_buildenv.py b/test/integration/toolchains/env/test_buildenv.py
similarity index 100%
rename from conans/test/integration/toolchains/env/test_buildenv.py
rename to test/integration/toolchains/env/test_buildenv.py
diff --git a/conans/test/integration/toolchains/env/test_virtualenv_default_apply.py b/test/integration/toolchains/env/test_virtualenv_default_apply.py
similarity index 100%
rename from conans/test/integration/toolchains/env/test_virtualenv_default_apply.py
rename to test/integration/toolchains/env/test_virtualenv_default_apply.py
diff --git a/conans/test/integration/toolchains/env/test_virtualenv_object_access.py b/test/integration/toolchains/env/test_virtualenv_object_access.py
similarity index 100%
rename from conans/test/integration/toolchains/env/test_virtualenv_object_access.py
rename to test/integration/toolchains/env/test_virtualenv_object_access.py
diff --git a/conans/test/integration/toolchains/env/test_virtualenv_winbash.py b/test/integration/toolchains/env/test_virtualenv_winbash.py
similarity index 100%
rename from conans/test/integration/toolchains/env/test_virtualenv_winbash.py
rename to test/integration/toolchains/env/test_virtualenv_winbash.py
diff --git a/conans/test/integration/toolchains/intel/__init__.py b/test/integration/toolchains/gnu/__init__.py
similarity index 100%
rename from conans/test/integration/toolchains/intel/__init__.py
rename to test/integration/toolchains/gnu/__init__.py
diff --git a/conans/test/integration/toolchains/gnu/test_autotoolsdeps.py b/test/integration/toolchains/gnu/test_autotoolsdeps.py
similarity index 100%
rename from conans/test/integration/toolchains/gnu/test_autotoolsdeps.py
rename to test/integration/toolchains/gnu/test_autotoolsdeps.py
diff --git a/conans/test/integration/toolchains/gnu/test_autotoolstoolchain.py b/test/integration/toolchains/gnu/test_autotoolstoolchain.py
similarity index 100%
rename from conans/test/integration/toolchains/gnu/test_autotoolstoolchain.py
rename to test/integration/toolchains/gnu/test_autotoolstoolchain.py
diff --git a/conans/test/integration/toolchains/gnu/test_basic_layout.py b/test/integration/toolchains/gnu/test_basic_layout.py
similarity index 100%
rename from conans/test/integration/toolchains/gnu/test_basic_layout.py
rename to test/integration/toolchains/gnu/test_basic_layout.py
diff --git a/conans/test/integration/toolchains/gnu/test_gnutoolchain.py b/test/integration/toolchains/gnu/test_gnutoolchain.py
similarity index 100%
rename from conans/test/integration/toolchains/gnu/test_gnutoolchain.py
rename to test/integration/toolchains/gnu/test_gnutoolchain.py
diff --git a/conans/test/integration/toolchains/gnu/test_makedeps.py b/test/integration/toolchains/gnu/test_makedeps.py
similarity index 100%
rename from conans/test/integration/toolchains/gnu/test_makedeps.py
rename to test/integration/toolchains/gnu/test_makedeps.py
diff --git a/conans/test/integration/toolchains/gnu/test_pkgconfigdeps.py b/test/integration/toolchains/gnu/test_pkgconfigdeps.py
similarity index 100%
rename from conans/test/integration/toolchains/gnu/test_pkgconfigdeps.py
rename to test/integration/toolchains/gnu/test_pkgconfigdeps.py
diff --git a/conans/test/integration/toolchains/meson/__init__.py b/test/integration/toolchains/google/__init__.py
similarity index 100%
rename from conans/test/integration/toolchains/meson/__init__.py
rename to test/integration/toolchains/google/__init__.py
diff --git a/conans/test/integration/toolchains/google/test_bazeldeps.py b/test/integration/toolchains/google/test_bazeldeps.py
similarity index 100%
rename from conans/test/integration/toolchains/google/test_bazeldeps.py
rename to test/integration/toolchains/google/test_bazeldeps.py
diff --git a/conans/test/integration/toolchains/google/test_bazeltoolchain.py b/test/integration/toolchains/google/test_bazeltoolchain.py
similarity index 100%
rename from conans/test/integration/toolchains/google/test_bazeltoolchain.py
rename to test/integration/toolchains/google/test_bazeltoolchain.py
diff --git a/conans/test/integration/toolchains/microsoft/__init__.py b/test/integration/toolchains/intel/__init__.py
similarity index 100%
rename from conans/test/integration/toolchains/microsoft/__init__.py
rename to test/integration/toolchains/intel/__init__.py
diff --git a/conans/test/integration/toolchains/intel/test_intel_cc.py b/test/integration/toolchains/intel/test_intel_cc.py
similarity index 100%
rename from conans/test/integration/toolchains/intel/test_intel_cc.py
rename to test/integration/toolchains/intel/test_intel_cc.py
diff --git a/conans/test/integration/toolchains/premake/__init__.py b/test/integration/toolchains/meson/__init__.py
similarity index 100%
rename from conans/test/integration/toolchains/premake/__init__.py
rename to test/integration/toolchains/meson/__init__.py
diff --git a/conans/test/integration/toolchains/meson/test_mesontoolchain.py b/test/integration/toolchains/meson/test_mesontoolchain.py
similarity index 100%
rename from conans/test/integration/toolchains/meson/test_mesontoolchain.py
rename to test/integration/toolchains/meson/test_mesontoolchain.py
diff --git a/conans/test/integration/toolchains/scons/__init__.py b/test/integration/toolchains/microsoft/__init__.py
similarity index 100%
rename from conans/test/integration/toolchains/scons/__init__.py
rename to test/integration/toolchains/microsoft/__init__.py
diff --git a/conans/test/integration/toolchains/microsoft/test_msbuilddeps.py b/test/integration/toolchains/microsoft/test_msbuilddeps.py
similarity index 100%
rename from conans/test/integration/toolchains/microsoft/test_msbuilddeps.py
rename to test/integration/toolchains/microsoft/test_msbuilddeps.py
diff --git a/conans/test/integration/toolchains/microsoft/test_msbuildtoolchain.py b/test/integration/toolchains/microsoft/test_msbuildtoolchain.py
similarity index 100%
rename from conans/test/integration/toolchains/microsoft/test_msbuildtoolchain.py
rename to test/integration/toolchains/microsoft/test_msbuildtoolchain.py
diff --git a/conans/test/integration/toolchains/microsoft/test_nmakedeps.py b/test/integration/toolchains/microsoft/test_nmakedeps.py
similarity index 100%
rename from conans/test/integration/toolchains/microsoft/test_nmakedeps.py
rename to test/integration/toolchains/microsoft/test_nmakedeps.py
diff --git a/conans/test/integration/toolchains/microsoft/test_vs_layout.py b/test/integration/toolchains/microsoft/test_vs_layout.py
similarity index 100%
rename from conans/test/integration/toolchains/microsoft/test_vs_layout.py
rename to test/integration/toolchains/microsoft/test_vs_layout.py
diff --git a/conans/test/integration/toolchains/microsoft/vcvars_test.py b/test/integration/toolchains/microsoft/vcvars_test.py
similarity index 100%
rename from conans/test/integration/toolchains/microsoft/vcvars_test.py
rename to test/integration/toolchains/microsoft/vcvars_test.py
diff --git a/conans/test/integration/tools/__init__.py b/test/integration/toolchains/premake/__init__.py
similarity index 100%
rename from conans/test/integration/tools/__init__.py
rename to test/integration/toolchains/premake/__init__.py
diff --git a/conans/test/integration/toolchains/premake/test_premakedeps.py b/test/integration/toolchains/premake/test_premakedeps.py
similarity index 100%
rename from conans/test/integration/toolchains/premake/test_premakedeps.py
rename to test/integration/toolchains/premake/test_premakedeps.py
diff --git a/conans/test/integration/tools/system/__init__.py b/test/integration/toolchains/scons/__init__.py
similarity index 100%
rename from conans/test/integration/tools/system/__init__.py
rename to test/integration/toolchains/scons/__init__.py
diff --git a/conans/test/integration/toolchains/scons/test_scondeps.py b/test/integration/toolchains/scons/test_scondeps.py
similarity index 100%
rename from conans/test/integration/toolchains/scons/test_scondeps.py
rename to test/integration/toolchains/scons/test_scondeps.py
diff --git a/conans/test/integration/toolchains/test_raise_on_universal_binaries.py b/test/integration/toolchains/test_raise_on_universal_binaries.py
similarity index 100%
rename from conans/test/integration/toolchains/test_raise_on_universal_binaries.py
rename to test/integration/toolchains/test_raise_on_universal_binaries.py
diff --git a/conans/test/integration/toolchains/test_toolchain_namespaces.py b/test/integration/toolchains/test_toolchain_namespaces.py
similarity index 100%
rename from conans/test/integration/toolchains/test_toolchain_namespaces.py
rename to test/integration/toolchains/test_toolchain_namespaces.py
diff --git a/conans/test/integration/ui/__init__.py b/test/integration/tools/__init__.py
similarity index 100%
rename from conans/test/integration/ui/__init__.py
rename to test/integration/tools/__init__.py
diff --git a/conans/test/integration/tools/conan_version_test.py b/test/integration/tools/conan_version_test.py
similarity index 100%
rename from conans/test/integration/tools/conan_version_test.py
rename to test/integration/tools/conan_version_test.py
diff --git a/conans/test/integration/tools/cppstd_minimum_version_test.py b/test/integration/tools/cppstd_minimum_version_test.py
similarity index 100%
rename from conans/test/integration/tools/cppstd_minimum_version_test.py
rename to test/integration/tools/cppstd_minimum_version_test.py
diff --git a/conans/test/integration/tools/cpu_count_test.py b/test/integration/tools/cpu_count_test.py
similarity index 100%
rename from conans/test/integration/tools/cpu_count_test.py
rename to test/integration/tools/cpu_count_test.py
diff --git a/conans/test/integration/tools/file_tools_test.py b/test/integration/tools/file_tools_test.py
similarity index 100%
rename from conans/test/integration/tools/file_tools_test.py
rename to test/integration/tools/file_tools_test.py
diff --git a/conans/test/integration/tools/fix_symlinks_test.py b/test/integration/tools/fix_symlinks_test.py
similarity index 100%
rename from conans/test/integration/tools/fix_symlinks_test.py
rename to test/integration/tools/fix_symlinks_test.py
diff --git a/conans/test/performance/__init__.py b/test/integration/tools/system/__init__.py
similarity index 100%
rename from conans/test/performance/__init__.py
rename to test/integration/tools/system/__init__.py
diff --git a/conans/test/integration/tools/system/package_manager_test.py b/test/integration/tools/system/package_manager_test.py
similarity index 100%
rename from conans/test/integration/tools/system/package_manager_test.py
rename to test/integration/tools/system/package_manager_test.py
diff --git a/conans/test/integration/tools/test_apple_xcrun.py b/test/integration/tools/test_apple_xcrun.py
similarity index 100%
rename from conans/test/integration/tools/test_apple_xcrun.py
rename to test/integration/tools/test_apple_xcrun.py
diff --git a/conans/test/unittests/__init__.py b/test/integration/ui/__init__.py
similarity index 100%
rename from conans/test/unittests/__init__.py
rename to test/integration/ui/__init__.py
diff --git a/conans/test/integration/ui/exit_with_code_test.py b/test/integration/ui/exit_with_code_test.py
similarity index 100%
rename from conans/test/integration/ui/exit_with_code_test.py
rename to test/integration/ui/exit_with_code_test.py
diff --git a/conans/test/unittests/cli/__init__.py b/test/performance/__init__.py
similarity index 100%
rename from conans/test/unittests/cli/__init__.py
rename to test/performance/__init__.py
diff --git a/conans/test/performance/test_large_graph.py b/test/performance/test_large_graph.py
similarity index 100%
rename from conans/test/performance/test_large_graph.py
rename to test/performance/test_large_graph.py
diff --git a/conans/test/unittests/client/__init__.py b/test/unittests/__init__.py
similarity index 100%
rename from conans/test/unittests/client/__init__.py
rename to test/unittests/__init__.py
diff --git a/conans/test/unittests/client/build/__init__.py b/test/unittests/cli/__init__.py
similarity index 100%
rename from conans/test/unittests/client/build/__init__.py
rename to test/unittests/cli/__init__.py
diff --git a/conans/test/unittests/cli/common_test.py b/test/unittests/cli/common_test.py
similarity index 100%
rename from conans/test/unittests/cli/common_test.py
rename to test/unittests/cli/common_test.py
diff --git a/conans/test/unittests/cli/test_cli_ref_matching.py b/test/unittests/cli/test_cli_ref_matching.py
similarity index 100%
rename from conans/test/unittests/cli/test_cli_ref_matching.py
rename to test/unittests/cli/test_cli_ref_matching.py
diff --git a/conans/test/unittests/client/command/__init__.py b/test/unittests/client/__init__.py
similarity index 100%
rename from conans/test/unittests/client/command/__init__.py
rename to test/unittests/client/__init__.py
diff --git a/conans/test/unittests/client/conf/__init__.py b/test/unittests/client/command/__init__.py
similarity index 100%
rename from conans/test/unittests/client/conf/__init__.py
rename to test/unittests/client/command/__init__.py
diff --git a/conans/test/unittests/client/command/parse_arguments_test.py b/test/unittests/client/command/parse_arguments_test.py
similarity index 100%
rename from conans/test/unittests/client/command/parse_arguments_test.py
rename to test/unittests/client/command/parse_arguments_test.py
diff --git a/conans/test/unittests/client/conan_output_test.py b/test/unittests/client/conan_output_test.py
similarity index 100%
rename from conans/test/unittests/client/conan_output_test.py
rename to test/unittests/client/conan_output_test.py
diff --git a/conans/test/unittests/client/conanfile_loader_test.py b/test/unittests/client/conanfile_loader_test.py
similarity index 100%
rename from conans/test/unittests/client/conanfile_loader_test.py
rename to test/unittests/client/conanfile_loader_test.py
diff --git a/conans/test/unittests/client/conf/config_installer/__init__.py b/test/unittests/client/conf/__init__.py
similarity index 100%
rename from conans/test/unittests/client/conf/config_installer/__init__.py
rename to test/unittests/client/conf/__init__.py
diff --git a/conans/test/unittests/client/file_copier/__init__.py b/test/unittests/client/conf/config_installer/__init__.py
similarity index 100%
rename from conans/test/unittests/client/file_copier/__init__.py
rename to test/unittests/client/conf/config_installer/__init__.py
diff --git a/conans/test/unittests/client/conf/config_installer/test_install_folder.py b/test/unittests/client/conf/config_installer/test_install_folder.py
similarity index 100%
rename from conans/test/unittests/client/conf/config_installer/test_install_folder.py
rename to test/unittests/client/conf/config_installer/test_install_folder.py
diff --git a/conans/test/unittests/client/conf/detect/__init__.py b/test/unittests/client/conf/detect/__init__.py
similarity index 100%
rename from conans/test/unittests/client/conf/detect/__init__.py
rename to test/unittests/client/conf/detect/__init__.py
diff --git a/conans/test/unittests/client/conf/detect/test_gcc_compiler.py b/test/unittests/client/conf/detect/test_gcc_compiler.py
similarity index 100%
rename from conans/test/unittests/client/conf/detect/test_gcc_compiler.py
rename to test/unittests/client/conf/detect/test_gcc_compiler.py
diff --git a/conans/test/unittests/client/graph/__init__.py b/test/unittests/client/file_copier/__init__.py
similarity index 100%
rename from conans/test/unittests/client/graph/__init__.py
rename to test/unittests/client/file_copier/__init__.py
diff --git a/conans/test/unittests/client/file_copier/test_report_copied_files.py b/test/unittests/client/file_copier/test_report_copied_files.py
similarity index 100%
rename from conans/test/unittests/client/file_copier/test_report_copied_files.py
rename to test/unittests/client/file_copier/test_report_copied_files.py
diff --git a/conans/test/unittests/client/migrations/__init__.py b/test/unittests/client/graph/__init__.py
similarity index 100%
rename from conans/test/unittests/client/migrations/__init__.py
rename to test/unittests/client/graph/__init__.py
diff --git a/conans/test/unittests/client/graph/build_mode_test.py b/test/unittests/client/graph/build_mode_test.py
similarity index 100%
rename from conans/test/unittests/client/graph/build_mode_test.py
rename to test/unittests/client/graph/build_mode_test.py
diff --git a/conans/test/unittests/client/graph/deps_graph_test.py b/test/unittests/client/graph/deps_graph_test.py
similarity index 100%
rename from conans/test/unittests/client/graph/deps_graph_test.py
rename to test/unittests/client/graph/deps_graph_test.py
diff --git a/conans/test/unittests/client/profile_loader/__init__.py b/test/unittests/client/migrations/__init__.py
similarity index 100%
rename from conans/test/unittests/client/profile_loader/__init__.py
rename to test/unittests/client/migrations/__init__.py
diff --git a/conans/test/unittests/client/migrations/test_migrator.py b/test/unittests/client/migrations/test_migrator.py
similarity index 100%
rename from conans/test/unittests/client/migrations/test_migrator.py
rename to test/unittests/client/migrations/test_migrator.py
diff --git a/conans/test/unittests/client/optimize_conanfile_load_test.py b/test/unittests/client/optimize_conanfile_load_test.py
similarity index 100%
rename from conans/test/unittests/client/optimize_conanfile_load_test.py
rename to test/unittests/client/optimize_conanfile_load_test.py
diff --git a/conans/test/unittests/client/rest/__init__.py b/test/unittests/client/profile_loader/__init__.py
similarity index 100%
rename from conans/test/unittests/client/rest/__init__.py
rename to test/unittests/client/profile_loader/__init__.py
diff --git a/conans/test/unittests/client/profile_loader/compiler_cppstd_test.py b/test/unittests/client/profile_loader/compiler_cppstd_test.py
similarity index 100%
rename from conans/test/unittests/client/profile_loader/compiler_cppstd_test.py
rename to test/unittests/client/profile_loader/compiler_cppstd_test.py
diff --git a/conans/test/unittests/client/profile_loader/profile_loader_test.py b/test/unittests/client/profile_loader/profile_loader_test.py
similarity index 100%
rename from conans/test/unittests/client/profile_loader/profile_loader_test.py
rename to test/unittests/client/profile_loader/profile_loader_test.py
diff --git a/conans/test/unittests/client/remote_manager_test.py b/test/unittests/client/remote_manager_test.py
similarity index 100%
rename from conans/test/unittests/client/remote_manager_test.py
rename to test/unittests/client/remote_manager_test.py
diff --git a/conans/test/unittests/client/rest/rest_client_v2/__init__.py b/test/unittests/client/rest/__init__.py
similarity index 100%
rename from conans/test/unittests/client/rest/rest_client_v2/__init__.py
rename to test/unittests/client/rest/__init__.py
diff --git a/conans/test/unittests/client/rest/downloader_test.py b/test/unittests/client/rest/downloader_test.py
similarity index 100%
rename from conans/test/unittests/client/rest/downloader_test.py
rename to test/unittests/client/rest/downloader_test.py
diff --git a/conans/test/unittests/client/rest/response_test.py b/test/unittests/client/rest/response_test.py
similarity index 100%
rename from conans/test/unittests/client/rest/response_test.py
rename to test/unittests/client/rest/response_test.py
diff --git a/conans/test/unittests/client/source/__init__.py b/test/unittests/client/rest/rest_client_v2/__init__.py
similarity index 100%
rename from conans/test/unittests/client/source/__init__.py
rename to test/unittests/client/rest/rest_client_v2/__init__.py
diff --git a/conans/test/unittests/client/rest/uploader_test.py b/test/unittests/client/rest/uploader_test.py
similarity index 100%
rename from conans/test/unittests/client/rest/uploader_test.py
rename to test/unittests/client/rest/uploader_test.py
diff --git a/conans/test/unittests/client/toolchain/__init__.py b/test/unittests/client/source/__init__.py
similarity index 100%
rename from conans/test/unittests/client/toolchain/__init__.py
rename to test/unittests/client/source/__init__.py
diff --git a/conans/test/unittests/client/toolchain/autotools/__init__.py b/test/unittests/client/toolchain/__init__.py
similarity index 100%
rename from conans/test/unittests/client/toolchain/autotools/__init__.py
rename to test/unittests/client/toolchain/__init__.py
diff --git a/conans/test/unittests/client/tools/__init__.py b/test/unittests/client/toolchain/autotools/__init__.py
similarity index 100%
rename from conans/test/unittests/client/tools/__init__.py
rename to test/unittests/client/toolchain/autotools/__init__.py
diff --git a/conans/test/unittests/client/toolchain/autotools/autotools_test.py b/test/unittests/client/toolchain/autotools/autotools_test.py
similarity index 100%
rename from conans/test/unittests/client/toolchain/autotools/autotools_test.py
rename to test/unittests/client/toolchain/autotools/autotools_test.py
diff --git a/conans/test/unittests/client/toolchain/autotools/autotools_toolchain_test.py b/test/unittests/client/toolchain/autotools/autotools_toolchain_test.py
similarity index 100%
rename from conans/test/unittests/client/toolchain/autotools/autotools_toolchain_test.py
rename to test/unittests/client/toolchain/autotools/autotools_toolchain_test.py
diff --git a/conans/test/unittests/client/tools/files/__init__.py b/test/unittests/client/tools/__init__.py
similarity index 100%
rename from conans/test/unittests/client/tools/files/__init__.py
rename to test/unittests/client/tools/__init__.py
diff --git a/conans/test/unittests/client/tools/apple/test_xcodebuild.py b/test/unittests/client/tools/apple/test_xcodebuild.py
similarity index 100%
rename from conans/test/unittests/client/tools/apple/test_xcodebuild.py
rename to test/unittests/client/tools/apple/test_xcodebuild.py
diff --git a/conans/test/unittests/client/tools/cppstd_required_test.py b/test/unittests/client/tools/cppstd_required_test.py
similarity index 100%
rename from conans/test/unittests/client/tools/cppstd_required_test.py
rename to test/unittests/client/tools/cppstd_required_test.py
diff --git a/conans/test/unittests/client/util/__init__.py b/test/unittests/client/tools/files/__init__.py
similarity index 100%
rename from conans/test/unittests/client/util/__init__.py
rename to test/unittests/client/tools/files/__init__.py
diff --git a/conans/test/unittests/client/tools/files/rename_test.py b/test/unittests/client/tools/files/rename_test.py
similarity index 100%
rename from conans/test/unittests/client/tools/files/rename_test.py
rename to test/unittests/client/tools/files/rename_test.py
diff --git a/conans/test/unittests/client/tools/test_env.py b/test/unittests/client/tools/test_env.py
similarity index 100%
rename from conans/test/unittests/client/tools/test_env.py
rename to test/unittests/client/tools/test_env.py
diff --git a/conans/test/unittests/client/userio_test.py b/test/unittests/client/userio_test.py
similarity index 100%
rename from conans/test/unittests/client/userio_test.py
rename to test/unittests/client/userio_test.py
diff --git a/conans/test/unittests/conan_build_info/__init__.py b/test/unittests/client/util/__init__.py
similarity index 100%
rename from conans/test/unittests/conan_build_info/__init__.py
rename to test/unittests/client/util/__init__.py
diff --git a/conans/test/unittests/client/util/time_test.py b/test/unittests/client/util/time_test.py
similarity index 100%
rename from conans/test/unittests/client/util/time_test.py
rename to test/unittests/client/util/time_test.py
diff --git a/conans/test/unittests/model/__init__.py b/test/unittests/conan_build_info/__init__.py
similarity index 100%
rename from conans/test/unittests/model/__init__.py
rename to test/unittests/conan_build_info/__init__.py
diff --git a/conans/test/unittests/conan_build_info/new_build_info_test.py b/test/unittests/conan_build_info/new_build_info_test.py
similarity index 100%
rename from conans/test/unittests/conan_build_info/new_build_info_test.py
rename to test/unittests/conan_build_info/new_build_info_test.py
diff --git a/conans/test/unittests/model/build_info/__init__.py b/test/unittests/model/__init__.py
similarity index 100%
rename from conans/test/unittests/model/build_info/__init__.py
rename to test/unittests/model/__init__.py
diff --git a/conans/test/unittests/model/version/__init__.py b/test/unittests/model/build_info/__init__.py
similarity index 100%
rename from conans/test/unittests/model/version/__init__.py
rename to test/unittests/model/build_info/__init__.py
diff --git a/conans/test/unittests/model/build_info/components_test.py b/test/unittests/model/build_info/components_test.py
similarity index 100%
rename from conans/test/unittests/model/build_info/components_test.py
rename to test/unittests/model/build_info/components_test.py
diff --git a/conans/test/unittests/model/build_info/generic_properties_test.py b/test/unittests/model/build_info/generic_properties_test.py
similarity index 100%
rename from conans/test/unittests/model/build_info/generic_properties_test.py
rename to test/unittests/model/build_info/generic_properties_test.py
diff --git a/conans/test/unittests/model/conanfile_test.py b/test/unittests/model/conanfile_test.py
similarity index 100%
rename from conans/test/unittests/model/conanfile_test.py
rename to test/unittests/model/conanfile_test.py
diff --git a/conans/test/unittests/model/info_test.py b/test/unittests/model/info_test.py
similarity index 100%
rename from conans/test/unittests/model/info_test.py
rename to test/unittests/model/info_test.py
diff --git a/conans/test/unittests/model/manifest_test.py b/test/unittests/model/manifest_test.py
similarity index 100%
rename from conans/test/unittests/model/manifest_test.py
rename to test/unittests/model/manifest_test.py
diff --git a/conans/test/unittests/model/options_test.py b/test/unittests/model/options_test.py
similarity index 100%
rename from conans/test/unittests/model/options_test.py
rename to test/unittests/model/options_test.py
diff --git a/conans/test/unittests/model/other_settings_test.py b/test/unittests/model/other_settings_test.py
similarity index 100%
rename from conans/test/unittests/model/other_settings_test.py
rename to test/unittests/model/other_settings_test.py
diff --git a/conans/test/unittests/model/profile_test.py b/test/unittests/model/profile_test.py
similarity index 100%
rename from conans/test/unittests/model/profile_test.py
rename to test/unittests/model/profile_test.py
diff --git a/conans/test/unittests/model/settings_test.py b/test/unittests/model/settings_test.py
similarity index 100%
rename from conans/test/unittests/model/settings_test.py
rename to test/unittests/model/settings_test.py
diff --git a/conans/test/unittests/model/test_conf.py b/test/unittests/model/test_conf.py
similarity index 100%
rename from conans/test/unittests/model/test_conf.py
rename to test/unittests/model/test_conf.py
diff --git a/conans/test/unittests/model/test_package_reference.py b/test/unittests/model/test_package_reference.py
similarity index 100%
rename from conans/test/unittests/model/test_package_reference.py
rename to test/unittests/model/test_package_reference.py
diff --git a/conans/test/unittests/model/test_recipe_reference.py b/test/unittests/model/test_recipe_reference.py
similarity index 100%
rename from conans/test/unittests/model/test_recipe_reference.py
rename to test/unittests/model/test_recipe_reference.py
diff --git a/conans/test/unittests/paths/__init__.py b/test/unittests/model/version/__init__.py
similarity index 100%
rename from conans/test/unittests/paths/__init__.py
rename to test/unittests/model/version/__init__.py
diff --git a/conans/test/unittests/model/version/test_version_bump.py b/test/unittests/model/version/test_version_bump.py
similarity index 100%
rename from conans/test/unittests/model/version/test_version_bump.py
rename to test/unittests/model/version/test_version_bump.py
diff --git a/conans/test/unittests/model/version/test_version_comparison.py b/test/unittests/model/version/test_version_comparison.py
similarity index 100%
rename from conans/test/unittests/model/version/test_version_comparison.py
rename to test/unittests/model/version/test_version_comparison.py
diff --git a/conans/test/unittests/model/version/test_version_parse.py b/test/unittests/model/version/test_version_parse.py
similarity index 100%
rename from conans/test/unittests/model/version/test_version_parse.py
rename to test/unittests/model/version/test_version_parse.py
diff --git a/conans/test/unittests/model/version/test_version_range.py b/test/unittests/model/version/test_version_range.py
similarity index 100%
rename from conans/test/unittests/model/version/test_version_range.py
rename to test/unittests/model/version/test_version_range.py
diff --git a/conans/test/unittests/model/version/test_version_range_intersection.py b/test/unittests/model/version/test_version_range_intersection.py
similarity index 100%
rename from conans/test/unittests/model/version/test_version_range_intersection.py
rename to test/unittests/model/version/test_version_range_intersection.py
diff --git a/conans/test/unittests/model/versionrepr_test.py b/test/unittests/model/versionrepr_test.py
similarity index 100%
rename from conans/test/unittests/model/versionrepr_test.py
rename to test/unittests/model/versionrepr_test.py
diff --git a/conans/test/unittests/search/__init__.py b/test/unittests/paths/__init__.py
similarity index 100%
rename from conans/test/unittests/search/__init__.py
rename to test/unittests/paths/__init__.py
diff --git a/conans/test/unittests/paths/user_home_test.py b/test/unittests/paths/user_home_test.py
similarity index 100%
rename from conans/test/unittests/paths/user_home_test.py
rename to test/unittests/paths/user_home_test.py
diff --git a/conans/test/unittests/server/__init__.py b/test/unittests/search/__init__.py
similarity index 100%
rename from conans/test/unittests/server/__init__.py
rename to test/unittests/search/__init__.py
diff --git a/conans/test/unittests/search/cache_db_search_test.py b/test/unittests/search/cache_db_search_test.py
similarity index 100%
rename from conans/test/unittests/search/cache_db_search_test.py
rename to test/unittests/search/cache_db_search_test.py
diff --git a/conans/test/unittests/search/search_query_parse_test.py b/test/unittests/search/search_query_parse_test.py
similarity index 100%
rename from conans/test/unittests/search/search_query_parse_test.py
rename to test/unittests/search/search_query_parse_test.py
diff --git a/conans/test/unittests/server/crypto/__init__.py b/test/unittests/server/__init__.py
similarity index 100%
rename from conans/test/unittests/server/crypto/__init__.py
rename to test/unittests/server/__init__.py
diff --git a/conans/test/unittests/server/authenticator_plugin_test.py b/test/unittests/server/authenticator_plugin_test.py
similarity index 100%
rename from conans/test/unittests/server/authenticator_plugin_test.py
rename to test/unittests/server/authenticator_plugin_test.py
diff --git a/conans/test/unittests/server/conan_server_config_parser_test.py b/test/unittests/server/conan_server_config_parser_test.py
similarity index 100%
rename from conans/test/unittests/server/conan_server_config_parser_test.py
rename to test/unittests/server/conan_server_config_parser_test.py
diff --git a/conans/test/unittests/server/conf_test.py b/test/unittests/server/conf_test.py
similarity index 100%
rename from conans/test/unittests/server/conf_test.py
rename to test/unittests/server/conf_test.py
diff --git a/conans/test/unittests/server/service/__init__.py b/test/unittests/server/crypto/__init__.py
similarity index 100%
rename from conans/test/unittests/server/service/__init__.py
rename to test/unittests/server/crypto/__init__.py
diff --git a/conans/test/unittests/server/crypto/jwt_test.py b/test/unittests/server/crypto/jwt_test.py
similarity index 100%
rename from conans/test/unittests/server/crypto/jwt_test.py
rename to test/unittests/server/crypto/jwt_test.py
diff --git a/conans/test/unittests/server/revision_list_test.py b/test/unittests/server/revision_list_test.py
similarity index 100%
rename from conans/test/unittests/server/revision_list_test.py
rename to test/unittests/server/revision_list_test.py
diff --git a/conans/test/unittests/source/__init__.py b/test/unittests/server/service/__init__.py
similarity index 100%
rename from conans/test/unittests/source/__init__.py
rename to test/unittests/server/service/__init__.py
diff --git a/conans/test/unittests/server/service/authorizer_test.py b/test/unittests/server/service/authorizer_test.py
similarity index 100%
rename from conans/test/unittests/server/service/authorizer_test.py
rename to test/unittests/server/service/authorizer_test.py
diff --git a/conans/test/unittests/server/service/service_test.py b/test/unittests/server/service/service_test.py
similarity index 100%
rename from conans/test/unittests/server/service/service_test.py
rename to test/unittests/server/service/service_test.py
diff --git a/conans/test/unittests/server/test_utils.py b/test/unittests/server/test_utils.py
similarity index 100%
rename from conans/test/unittests/server/test_utils.py
rename to test/unittests/server/test_utils.py
diff --git a/conans/test/unittests/tools/__init__.py b/test/unittests/source/__init__.py
similarity index 100%
rename from conans/test/unittests/tools/__init__.py
rename to test/unittests/source/__init__.py
diff --git a/conans/test/unittests/source/merge_directories_test.py b/test/unittests/source/merge_directories_test.py
similarity index 100%
rename from conans/test/unittests/source/merge_directories_test.py
rename to test/unittests/source/merge_directories_test.py
diff --git a/conans/test/unittests/tools/android/__init__.py b/test/unittests/tools/__init__.py
similarity index 100%
rename from conans/test/unittests/tools/android/__init__.py
rename to test/unittests/tools/__init__.py
diff --git a/conans/test/unittests/tools/apple/__init__.py b/test/unittests/tools/android/__init__.py
similarity index 100%
rename from conans/test/unittests/tools/apple/__init__.py
rename to test/unittests/tools/android/__init__.py
diff --git a/conans/test/unittests/tools/android/test_android_tools.py b/test/unittests/tools/android/test_android_tools.py
similarity index 100%
rename from conans/test/unittests/tools/android/test_android_tools.py
rename to test/unittests/tools/android/test_android_tools.py
diff --git a/conans/test/unittests/tools/build/__init__.py b/test/unittests/tools/apple/__init__.py
similarity index 100%
rename from conans/test/unittests/tools/build/__init__.py
rename to test/unittests/tools/apple/__init__.py
diff --git a/conans/test/unittests/tools/apple/test_apple_tools.py b/test/unittests/tools/apple/test_apple_tools.py
similarity index 100%
rename from conans/test/unittests/tools/apple/test_apple_tools.py
rename to test/unittests/tools/apple/test_apple_tools.py
diff --git a/conans/test/unittests/tools/cmake/__init__.py b/test/unittests/tools/cmake/__init__.py
similarity index 100%
rename from conans/test/unittests/tools/cmake/__init__.py
rename to test/unittests/tools/cmake/__init__.py
diff --git a/conans/test/unittests/tools/cmake/test_cmake_cmd_line_args.py b/test/unittests/tools/cmake/test_cmake_cmd_line_args.py
similarity index 100%
rename from conans/test/unittests/tools/cmake/test_cmake_cmd_line_args.py
rename to test/unittests/tools/cmake/test_cmake_cmd_line_args.py
diff --git a/conans/test/unittests/tools/cmake/test_cmake_install.py b/test/unittests/tools/cmake/test_cmake_install.py
similarity index 100%
rename from conans/test/unittests/tools/cmake/test_cmake_install.py
rename to test/unittests/tools/cmake/test_cmake_install.py
diff --git a/conans/test/unittests/tools/cmake/test_cmake_presets_definitions.py b/test/unittests/tools/cmake/test_cmake_presets_definitions.py
similarity index 100%
rename from conans/test/unittests/tools/cmake/test_cmake_presets_definitions.py
rename to test/unittests/tools/cmake/test_cmake_presets_definitions.py
diff --git a/conans/test/unittests/tools/cmake/test_cmake_test.py b/test/unittests/tools/cmake/test_cmake_test.py
similarity index 100%
rename from conans/test/unittests/tools/cmake/test_cmake_test.py
rename to test/unittests/tools/cmake/test_cmake_test.py
diff --git a/conans/test/unittests/tools/cmake/test_cmakedeps.py b/test/unittests/tools/cmake/test_cmakedeps.py
similarity index 100%
rename from conans/test/unittests/tools/cmake/test_cmakedeps.py
rename to test/unittests/tools/cmake/test_cmakedeps.py
diff --git a/conans/test/unittests/tools/cmake/test_cmaketoolchain.py b/test/unittests/tools/cmake/test_cmaketoolchain.py
similarity index 100%
rename from conans/test/unittests/tools/cmake/test_cmaketoolchain.py
rename to test/unittests/tools/cmake/test_cmaketoolchain.py
diff --git a/conans/test/unittests/tools/env/__init__.py b/test/unittests/tools/env/__init__.py
similarity index 100%
rename from conans/test/unittests/tools/env/__init__.py
rename to test/unittests/tools/env/__init__.py
diff --git a/conans/test/unittests/tools/env/test_env.py b/test/unittests/tools/env/test_env.py
similarity index 100%
rename from conans/test/unittests/tools/env/test_env.py
rename to test/unittests/tools/env/test_env.py
diff --git a/conans/test/unittests/tools/env/test_env_files.py b/test/unittests/tools/env/test_env_files.py
similarity index 100%
rename from conans/test/unittests/tools/env/test_env_files.py
rename to test/unittests/tools/env/test_env_files.py
diff --git a/conans/test/unittests/tools/files/__init__.py b/test/unittests/tools/files/__init__.py
similarity index 100%
rename from conans/test/unittests/tools/files/__init__.py
rename to test/unittests/tools/files/__init__.py
diff --git a/conans/test/unittests/tools/files/checksums_test.py b/test/unittests/tools/files/checksums_test.py
similarity index 100%
rename from conans/test/unittests/tools/files/checksums_test.py
rename to test/unittests/tools/files/checksums_test.py
diff --git a/conans/test/unittests/tools/files/collect_lib_test.py b/test/unittests/tools/files/collect_lib_test.py
similarity index 100%
rename from conans/test/unittests/tools/files/collect_lib_test.py
rename to test/unittests/tools/files/collect_lib_test.py
diff --git a/conans/test/unittests/tools/files/test_downloads.py b/test/unittests/tools/files/test_downloads.py
similarity index 100%
rename from conans/test/unittests/tools/files/test_downloads.py
rename to test/unittests/tools/files/test_downloads.py
diff --git a/conans/test/unittests/tools/files/test_file_read_and_write.py b/test/unittests/tools/files/test_file_read_and_write.py
similarity index 100%
rename from conans/test/unittests/tools/files/test_file_read_and_write.py
rename to test/unittests/tools/files/test_file_read_and_write.py
diff --git a/conans/test/unittests/tools/files/test_patches.py b/test/unittests/tools/files/test_patches.py
similarity index 100%
rename from conans/test/unittests/tools/files/test_patches.py
rename to test/unittests/tools/files/test_patches.py
diff --git a/conans/test/unittests/tools/files/test_rename.py b/test/unittests/tools/files/test_rename.py
similarity index 100%
rename from conans/test/unittests/tools/files/test_rename.py
rename to test/unittests/tools/files/test_rename.py
diff --git a/conans/test/unittests/tools/files/test_rm.py b/test/unittests/tools/files/test_rm.py
similarity index 100%
rename from conans/test/unittests/tools/files/test_rm.py
rename to test/unittests/tools/files/test_rm.py
diff --git a/conans/test/unittests/tools/files/test_symlinks.py b/test/unittests/tools/files/test_symlinks.py
similarity index 100%
rename from conans/test/unittests/tools/files/test_symlinks.py
rename to test/unittests/tools/files/test_symlinks.py
diff --git a/conans/test/unittests/tools/files/test_tool_copy.py b/test/unittests/tools/files/test_tool_copy.py
similarity index 100%
rename from conans/test/unittests/tools/files/test_tool_copy.py
rename to test/unittests/tools/files/test_tool_copy.py
diff --git a/conans/test/unittests/tools/files/test_toolchain.py b/test/unittests/tools/files/test_toolchain.py
similarity index 100%
rename from conans/test/unittests/tools/files/test_toolchain.py
rename to test/unittests/tools/files/test_toolchain.py
diff --git a/conans/test/unittests/tools/files/test_zipping.py b/test/unittests/tools/files/test_zipping.py
similarity index 100%
rename from conans/test/unittests/tools/files/test_zipping.py
rename to test/unittests/tools/files/test_zipping.py
diff --git a/conans/test/unittests/tools/files_patch_test.py b/test/unittests/tools/files_patch_test.py
similarity index 100%
rename from conans/test/unittests/tools/files_patch_test.py
rename to test/unittests/tools/files_patch_test.py
diff --git a/conans/test/unittests/tools/gnu/__init__.py b/test/unittests/tools/gnu/__init__.py
similarity index 100%
rename from conans/test/unittests/tools/gnu/__init__.py
rename to test/unittests/tools/gnu/__init__.py
diff --git a/conans/test/unittests/tools/gnu/autotools_test.py b/test/unittests/tools/gnu/autotools_test.py
similarity index 100%
rename from conans/test/unittests/tools/gnu/autotools_test.py
rename to test/unittests/tools/gnu/autotools_test.py
diff --git a/conans/test/unittests/tools/gnu/autotoolschain_test.py b/test/unittests/tools/gnu/autotoolschain_test.py
similarity index 100%
rename from conans/test/unittests/tools/gnu/autotoolschain_test.py
rename to test/unittests/tools/gnu/autotoolschain_test.py
diff --git a/conans/test/unittests/tools/gnu/gnudepsflags_test.py b/test/unittests/tools/gnu/gnudepsflags_test.py
similarity index 100%
rename from conans/test/unittests/tools/gnu/gnudepsflags_test.py
rename to test/unittests/tools/gnu/gnudepsflags_test.py
diff --git a/conans/test/unittests/tools/gnu/test_gnutoolchain.py b/test/unittests/tools/gnu/test_gnutoolchain.py
similarity index 100%
rename from conans/test/unittests/tools/gnu/test_gnutoolchain.py
rename to test/unittests/tools/gnu/test_gnutoolchain.py
diff --git a/conans/test/unittests/tools/gnu/test_triplets.py b/test/unittests/tools/gnu/test_triplets.py
similarity index 100%
rename from conans/test/unittests/tools/gnu/test_triplets.py
rename to test/unittests/tools/gnu/test_triplets.py
diff --git a/conans/test/unittests/tools/google/__init__.py b/test/unittests/tools/google/__init__.py
similarity index 100%
rename from conans/test/unittests/tools/google/__init__.py
rename to test/unittests/tools/google/__init__.py
diff --git a/conans/test/unittests/tools/google/test_bazel.py b/test/unittests/tools/google/test_bazel.py
similarity index 100%
rename from conans/test/unittests/tools/google/test_bazel.py
rename to test/unittests/tools/google/test_bazel.py
diff --git a/conans/test/unittests/tools/intel/__init__.py b/test/unittests/tools/intel/__init__.py
similarity index 100%
rename from conans/test/unittests/tools/intel/__init__.py
rename to test/unittests/tools/intel/__init__.py
diff --git a/conans/test/unittests/tools/intel/test_intel_cc.py b/test/unittests/tools/intel/test_intel_cc.py
similarity index 100%
rename from conans/test/unittests/tools/intel/test_intel_cc.py
rename to test/unittests/tools/intel/test_intel_cc.py
diff --git a/conans/test/unittests/tools/meson/__init__.py b/test/unittests/tools/meson/__init__.py
similarity index 100%
rename from conans/test/unittests/tools/meson/__init__.py
rename to test/unittests/tools/meson/__init__.py
diff --git a/conans/test/unittests/tools/meson/test_meson.py b/test/unittests/tools/meson/test_meson.py
similarity index 100%
rename from conans/test/unittests/tools/meson/test_meson.py
rename to test/unittests/tools/meson/test_meson.py
diff --git a/conans/test/unittests/tools/microsoft/__init__.py b/test/unittests/tools/microsoft/__init__.py
similarity index 100%
rename from conans/test/unittests/tools/microsoft/__init__.py
rename to test/unittests/tools/microsoft/__init__.py
diff --git a/conans/test/unittests/tools/microsoft/conantoolchain.props b/test/unittests/tools/microsoft/conantoolchain.props
similarity index 100%
rename from conans/test/unittests/tools/microsoft/conantoolchain.props
rename to test/unittests/tools/microsoft/conantoolchain.props
diff --git a/conans/test/unittests/tools/microsoft/conantoolchain_release_x64.props b/test/unittests/tools/microsoft/conantoolchain_release_x64.props
similarity index 100%
rename from conans/test/unittests/tools/microsoft/conantoolchain_release_x64.props
rename to test/unittests/tools/microsoft/conantoolchain_release_x64.props
diff --git a/conans/test/unittests/tools/microsoft/test_check_min_vs.py b/test/unittests/tools/microsoft/test_check_min_vs.py
similarity index 100%
rename from conans/test/unittests/tools/microsoft/test_check_min_vs.py
rename to test/unittests/tools/microsoft/test_check_min_vs.py
diff --git a/conans/test/unittests/tools/microsoft/test_msbuild.py b/test/unittests/tools/microsoft/test_msbuild.py
similarity index 100%
rename from conans/test/unittests/tools/microsoft/test_msbuild.py
rename to test/unittests/tools/microsoft/test_msbuild.py
diff --git a/conans/test/unittests/tools/microsoft/test_msvs_toolset.py b/test/unittests/tools/microsoft/test_msvs_toolset.py
similarity index 100%
rename from conans/test/unittests/tools/microsoft/test_msvs_toolset.py
rename to test/unittests/tools/microsoft/test_msvs_toolset.py
diff --git a/conans/test/unittests/tools/microsoft/test_subsystem.py b/test/unittests/tools/microsoft/test_subsystem.py
similarity index 100%
rename from conans/test/unittests/tools/microsoft/test_subsystem.py
rename to test/unittests/tools/microsoft/test_subsystem.py
diff --git a/conans/test/unittests/util/__init__.py b/test/unittests/util/__init__.py
similarity index 100%
rename from conans/test/unittests/util/__init__.py
rename to test/unittests/util/__init__.py
diff --git a/conans/test/unittests/util/apple_test.py b/test/unittests/util/apple_test.py
similarity index 100%
rename from conans/test/unittests/util/apple_test.py
rename to test/unittests/util/apple_test.py
diff --git a/conans/test/unittests/util/conanfile_tools_test.py b/test/unittests/util/conanfile_tools_test.py
similarity index 100%
rename from conans/test/unittests/util/conanfile_tools_test.py
rename to test/unittests/util/conanfile_tools_test.py
diff --git a/conans/test/unittests/util/detect_libc_test.py b/test/unittests/util/detect_libc_test.py
similarity index 100%
rename from conans/test/unittests/util/detect_libc_test.py
rename to test/unittests/util/detect_libc_test.py
diff --git a/conans/test/unittests/util/detect_test.py b/test/unittests/util/detect_test.py
similarity index 100%
rename from conans/test/unittests/util/detect_test.py
rename to test/unittests/util/detect_test.py
diff --git a/conans/test/unittests/util/detected_architecture_test.py b/test/unittests/util/detected_architecture_test.py
similarity index 100%
rename from conans/test/unittests/util/detected_architecture_test.py
rename to test/unittests/util/detected_architecture_test.py
diff --git a/conans/test/unittests/util/env_reader_test.py b/test/unittests/util/env_reader_test.py
similarity index 100%
rename from conans/test/unittests/util/env_reader_test.py
rename to test/unittests/util/env_reader_test.py
diff --git a/conans/test/unittests/util/file_hashes_test.py b/test/unittests/util/file_hashes_test.py
similarity index 100%
rename from conans/test/unittests/util/file_hashes_test.py
rename to test/unittests/util/file_hashes_test.py
diff --git a/conans/test/unittests/util/files/__init__.py b/test/unittests/util/files/__init__.py
similarity index 100%
rename from conans/test/unittests/util/files/__init__.py
rename to test/unittests/util/files/__init__.py
diff --git a/conans/test/unittests/util/files/strip_root_extract_test.py b/test/unittests/util/files/strip_root_extract_test.py
similarity index 100%
rename from conans/test/unittests/util/files/strip_root_extract_test.py
rename to test/unittests/util/files/strip_root_extract_test.py
diff --git a/conans/test/unittests/util/files/tar_extract_test.py b/test/unittests/util/files/tar_extract_test.py
similarity index 100%
rename from conans/test/unittests/util/files/tar_extract_test.py
rename to test/unittests/util/files/tar_extract_test.py
diff --git a/conans/test/unittests/util/files/test_copy_compat.py b/test/unittests/util/files/test_copy_compat.py
similarity index 100%
rename from conans/test/unittests/util/files/test_copy_compat.py
rename to test/unittests/util/files/test_copy_compat.py
diff --git a/conans/test/unittests/util/files/test_dirty.py b/test/unittests/util/files/test_dirty.py
similarity index 100%
rename from conans/test/unittests/util/files/test_dirty.py
rename to test/unittests/util/files/test_dirty.py
diff --git a/conans/test/unittests/util/files/test_remove.py b/test/unittests/util/files/test_remove.py
similarity index 100%
rename from conans/test/unittests/util/files/test_remove.py
rename to test/unittests/util/files/test_remove.py
diff --git a/conans/test/unittests/util/files_extract_wildcard_test.py b/test/unittests/util/files_extract_wildcard_test.py
similarity index 100%
rename from conans/test/unittests/util/files_extract_wildcard_test.py
rename to test/unittests/util/files_extract_wildcard_test.py
diff --git a/conans/test/unittests/util/local_db_test.py b/test/unittests/util/local_db_test.py
similarity index 100%
rename from conans/test/unittests/util/local_db_test.py
rename to test/unittests/util/local_db_test.py
diff --git a/conans/test/unittests/util/output_test.py b/test/unittests/util/output_test.py
similarity index 100%
rename from conans/test/unittests/util/output_test.py
rename to test/unittests/util/output_test.py
diff --git a/conans/test/unittests/util/test_encrypt.py b/test/unittests/util/test_encrypt.py
similarity index 100%
rename from conans/test/unittests/util/test_encrypt.py
rename to test/unittests/util/test_encrypt.py
diff --git a/conans/test/unittests/util/tools_test.py b/test/unittests/util/tools_test.py
similarity index 100%
rename from conans/test/unittests/util/tools_test.py
rename to test/unittests/util/tools_test.py
diff --git a/conans/test/unittests/util/unix_path_test.py b/test/unittests/util/unix_path_test.py
similarity index 100%
rename from conans/test/unittests/util/unix_path_test.py
rename to test/unittests/util/unix_path_test.py
diff --git a/conans/test/unittests/util/xz_test.py b/test/unittests/util/xz_test.py
similarity index 100%
rename from conans/test/unittests/util/xz_test.py
rename to test/unittests/util/xz_test.py
diff --git a/conans/test/unittests/util/zip_permissions_test.py b/test/unittests/util/zip_permissions_test.py
similarity index 100%
rename from conans/test/unittests/util/zip_permissions_test.py
rename to test/unittests/util/zip_permissions_test.py