diff --git a/src/Mod/CAM/Tests/Drilling_1.FCStd b/src/Mod/CAM/CAMTests/Drilling_1.FCStd
similarity index 100%
rename from src/Mod/CAM/Tests/Drilling_1.FCStd
rename to src/Mod/CAM/CAMTests/Drilling_1.FCStd
diff --git a/src/Mod/CAM/Tests/FilePathTestUtils.py b/src/Mod/CAM/CAMTests/FilePathTestUtils.py
similarity index 100%
rename from src/Mod/CAM/Tests/FilePathTestUtils.py
rename to src/Mod/CAM/CAMTests/FilePathTestUtils.py
diff --git a/src/Mod/CAM/Tests/PathTestUtils.py b/src/Mod/CAM/CAMTests/PathTestUtils.py
similarity index 100%
rename from src/Mod/CAM/Tests/PathTestUtils.py
rename to src/Mod/CAM/CAMTests/PathTestUtils.py
diff --git a/src/Mod/CAM/Tests/TestCAMSanity.py b/src/Mod/CAM/CAMTests/TestCAMSanity.py
similarity index 98%
rename from src/Mod/CAM/Tests/TestCAMSanity.py
rename to src/Mod/CAM/CAMTests/TestCAMSanity.py
index 7b710617eb..a182d49fe5 100644
--- a/src/Mod/CAM/Tests/TestCAMSanity.py
+++ b/src/Mod/CAM/CAMTests/TestCAMSanity.py
@@ -36,14 +36,14 @@ import unittest
 from unittest.mock import patch, MagicMock
 import urllib
 import tempfile
-from Tests.PathTestUtils import PathTestBase
+from CAMTests.PathTestUtils import PathTestBase
 
 
 class TestCAMSanity(PathTestBase):
     @classmethod
     def setUpClass(cls):
         FreeCAD.ConfigSet("SuppressRecomputeRequiredDialog", "True")
-        cls.doc = FreeCAD.open(FreeCAD.getHomePath() + "/Mod/CAM/Tests/boxtest.fcstd")
+        cls.doc = FreeCAD.open(FreeCAD.getHomePath() + "/Mod/CAM/CAMTests/boxtest.fcstd")
         FreeCAD.ConfigSet("SuppressRecomputeRequiredDialog", "")
         cls.job = cls.doc.getObject("Job")
 
@@ -303,7 +303,7 @@ class TestCAMSanity(PathTestBase):
     #         gcode = processor.export(objs, filename, postArgs)
     #         return (gcode, filename)
 
-    #     doc = FreeCAD.open(FreeCAD.getHomePath() + "/Mod/CAM/Tests/boxtest.fcstd")
+    #     doc = FreeCAD.open(FreeCAD.getHomePath() + "/Mod/CAM/CAMTests/boxtest.fcstd")
     #     job = self.doc.getObject("Job")
 
     #     postlist = PathPost.buildPostList(job)
diff --git a/src/Mod/CAM/Tests/TestCentroidPost.py b/src/Mod/CAM/CAMTests/TestCentroidPost.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestCentroidPost.py
rename to src/Mod/CAM/CAMTests/TestCentroidPost.py
index f72d0ebffc..217b57a493 100644
--- a/src/Mod/CAM/Tests/TestCentroidPost.py
+++ b/src/Mod/CAM/CAMTests/TestCentroidPost.py
@@ -26,7 +26,7 @@ from importlib import reload
 import FreeCAD
 
 import Path
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 from Path.Post.scripts import centroid_post as postprocessor
 
 
diff --git a/src/Mod/CAM/Tests/TestGrblPost.py b/src/Mod/CAM/CAMTests/TestGrblPost.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestGrblPost.py
rename to src/Mod/CAM/CAMTests/TestGrblPost.py
index f113c07d6c..989a2a6bf8 100644
--- a/src/Mod/CAM/Tests/TestGrblPost.py
+++ b/src/Mod/CAM/CAMTests/TestGrblPost.py
@@ -23,7 +23,7 @@
 import FreeCAD
 
 import Path
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 from importlib import reload
 from Path.Post.scripts import grbl_post as postprocessor
 
diff --git a/src/Mod/CAM/Tests/TestLinuxCNCPost.py b/src/Mod/CAM/CAMTests/TestLinuxCNCPost.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestLinuxCNCPost.py
rename to src/Mod/CAM/CAMTests/TestLinuxCNCPost.py
index 1917d4f3a5..5a1ca7a9cf 100644
--- a/src/Mod/CAM/Tests/TestLinuxCNCPost.py
+++ b/src/Mod/CAM/CAMTests/TestLinuxCNCPost.py
@@ -24,7 +24,7 @@
 import FreeCAD
 
 import Path
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 from importlib import reload
 from Path.Post.scripts import linuxcnc_post as postprocessor
 
diff --git a/src/Mod/CAM/Tests/TestMach3Mach4Post.py b/src/Mod/CAM/CAMTests/TestMach3Mach4Post.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestMach3Mach4Post.py
rename to src/Mod/CAM/CAMTests/TestMach3Mach4Post.py
index 8af054fa39..2a2d90c4a3 100644
--- a/src/Mod/CAM/Tests/TestMach3Mach4Post.py
+++ b/src/Mod/CAM/CAMTests/TestMach3Mach4Post.py
@@ -26,7 +26,7 @@ from importlib import reload
 import FreeCAD
 
 import Path
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 from Path.Post.scripts import mach3_mach4_post as postprocessor
 
 
diff --git a/src/Mod/CAM/Tests/TestPathAdaptive.py b/src/Mod/CAM/CAMTests/TestPathAdaptive.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestPathAdaptive.py
rename to src/Mod/CAM/CAMTests/TestPathAdaptive.py
index bce4a4c337..9325d4b836 100644
--- a/src/Mod/CAM/Tests/TestPathAdaptive.py
+++ b/src/Mod/CAM/CAMTests/TestPathAdaptive.py
@@ -26,7 +26,7 @@ import FreeCAD
 import Part
 import Path.Op.Adaptive as PathAdaptive
 import Path.Main.Job as PathJob
-from Tests.PathTestUtils import PathTestBase
+from CAMTests.PathTestUtils import PathTestBase
 
 if FreeCAD.GuiUp:
     import Path.Main.Gui.Job as PathJobGui
@@ -53,7 +53,7 @@ class TestPathAdaptive(PathTestBase):
         # Open existing FreeCAD document with test geometry
         cls.needsInit = False
         FreeCAD.ConfigSet("SuppressRecomputeRequiredDialog", "True")
-        cls.doc = FreeCAD.open(FreeCAD.getHomePath() + "Mod/CAM/Tests/test_adaptive.fcstd")
+        cls.doc = FreeCAD.open(FreeCAD.getHomePath() + "Mod/CAM/CAMTests/test_adaptive.fcstd")
         FreeCAD.ConfigSet("SuppressRecomputeRequiredDialog", "")
 
         # Create Job object, adding geometry objects from file opened above
diff --git a/src/Mod/CAM/Tests/TestPathCore.py b/src/Mod/CAM/CAMTests/TestPathCore.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestPathCore.py
rename to src/Mod/CAM/CAMTests/TestPathCore.py
index e3d4eeb455..c4e53a9899 100644
--- a/src/Mod/CAM/Tests/TestPathCore.py
+++ b/src/Mod/CAM/CAMTests/TestPathCore.py
@@ -22,7 +22,7 @@
 
 import FreeCAD
 import Path
-from Tests.PathTestUtils import PathTestBase
+from CAMTests.PathTestUtils import PathTestBase
 
 
 class TestPathCore(PathTestBase):
diff --git a/src/Mod/CAM/Tests/TestPathDepthParams.py b/src/Mod/CAM/CAMTests/TestPathDepthParams.py
similarity index 100%
rename from src/Mod/CAM/Tests/TestPathDepthParams.py
rename to src/Mod/CAM/CAMTests/TestPathDepthParams.py
diff --git a/src/Mod/CAM/Tests/TestPathDressupDogbone.py b/src/Mod/CAM/CAMTests/TestPathDressupDogbone.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestPathDressupDogbone.py
rename to src/Mod/CAM/CAMTests/TestPathDressupDogbone.py
index 6580767cd5..7eb66393c5 100644
--- a/src/Mod/CAM/Tests/TestPathDressupDogbone.py
+++ b/src/Mod/CAM/CAMTests/TestPathDressupDogbone.py
@@ -26,7 +26,7 @@ import Path.Dressup.Gui.Dogbone as PathDressupDogbone
 import Path.Main.Job as PathJob
 import Path.Op.Profile as PathProfile
 
-from Tests.PathTestUtils import PathTestBase
+from CAMTests.PathTestUtils import PathTestBase
 
 
 class TestProfile:
diff --git a/src/Mod/CAM/Tests/TestPathDressupDogboneII.py b/src/Mod/CAM/CAMTests/TestPathDressupDogboneII.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestPathDressupDogboneII.py
rename to src/Mod/CAM/CAMTests/TestPathDressupDogboneII.py
index c0b0a0eb21..df2df69eb2 100644
--- a/src/Mod/CAM/Tests/TestPathDressupDogboneII.py
+++ b/src/Mod/CAM/CAMTests/TestPathDressupDogboneII.py
@@ -25,7 +25,7 @@ import Path
 import Path.Base.Generator.dogboneII as dogboneII
 import Path.Base.Language as PathLanguage
 import Path.Dressup.DogboneII
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 import math
 
 PI = math.pi
diff --git a/src/Mod/CAM/Tests/TestPathDressupHoldingTags.py b/src/Mod/CAM/CAMTests/TestPathDressupHoldingTags.py
similarity index 98%
rename from src/Mod/CAM/Tests/TestPathDressupHoldingTags.py
rename to src/Mod/CAM/CAMTests/TestPathDressupHoldingTags.py
index c7209f4d37..473a0a3184 100644
--- a/src/Mod/CAM/Tests/TestPathDressupHoldingTags.py
+++ b/src/Mod/CAM/CAMTests/TestPathDressupHoldingTags.py
@@ -20,7 +20,7 @@
 # *                                                                         *
 # ***************************************************************************
 
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 import math
 
 from FreeCAD import Vector
diff --git a/src/Mod/CAM/Tests/TestPathDrillGenerator.py b/src/Mod/CAM/CAMTests/TestPathDrillGenerator.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestPathDrillGenerator.py
rename to src/Mod/CAM/CAMTests/TestPathDrillGenerator.py
index bf707ff9df..7a1bc1abab 100644
--- a/src/Mod/CAM/Tests/TestPathDrillGenerator.py
+++ b/src/Mod/CAM/CAMTests/TestPathDrillGenerator.py
@@ -24,7 +24,7 @@ import FreeCAD
 import Part
 import Path
 import Path.Base.Generator.drill as generator
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 
 Path.Log.setLevel(Path.Log.Level.INFO, Path.Log.thisModule())
 Path.Log.trackModule(Path.Log.thisModule())
diff --git a/src/Mod/CAM/Tests/TestPathDrillable.py b/src/Mod/CAM/CAMTests/TestPathDrillable.py
similarity index 98%
rename from src/Mod/CAM/Tests/TestPathDrillable.py
rename to src/Mod/CAM/CAMTests/TestPathDrillable.py
index ec63e99b62..fa14ba915e 100644
--- a/src/Mod/CAM/Tests/TestPathDrillable.py
+++ b/src/Mod/CAM/CAMTests/TestPathDrillable.py
@@ -23,7 +23,7 @@
 import FreeCAD as App
 import Path
 import Path.Base.Drillable as Drillable
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 
 
 if False:
@@ -36,7 +36,7 @@ else:
 class TestPathDrillable(PathTestUtils.PathTestBase):
     def setUp(self):
         App.ConfigSet("SuppressRecomputeRequiredDialog", "True")
-        self.doc = App.open(App.getHomePath() + "/Mod/CAM/Tests/Drilling_1.FCStd")
+        self.doc = App.open(App.getHomePath() + "/Mod/CAM/CAMTests/Drilling_1.FCStd")
         App.ConfigSet("SuppressRecomputeRequiredDialog", "")
         self.obj = self.doc.getObject("Pocket011")
 
diff --git a/src/Mod/CAM/Tests/TestPathGeneratorDogboneII.py b/src/Mod/CAM/CAMTests/TestPathGeneratorDogboneII.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestPathGeneratorDogboneII.py
rename to src/Mod/CAM/CAMTests/TestPathGeneratorDogboneII.py
index de8af7fd5a..e5644fb3c9 100644
--- a/src/Mod/CAM/Tests/TestPathGeneratorDogboneII.py
+++ b/src/Mod/CAM/CAMTests/TestPathGeneratorDogboneII.py
@@ -24,7 +24,7 @@ import FreeCAD
 import Path
 import Path.Base.Generator.dogboneII as dogboneII
 import Path.Base.Language as PathLanguage
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 import math
 
 
diff --git a/src/Mod/CAM/Tests/TestPathGeom.py b/src/Mod/CAM/CAMTests/TestPathGeom.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestPathGeom.py
rename to src/Mod/CAM/CAMTests/TestPathGeom.py
index 9722c0ad98..67895e5f24 100644
--- a/src/Mod/CAM/Tests/TestPathGeom.py
+++ b/src/Mod/CAM/CAMTests/TestPathGeom.py
@@ -25,7 +25,7 @@ import Path
 import math
 
 from FreeCAD import Vector
-from Tests.PathTestUtils import PathTestBase
+from CAMTests.PathTestUtils import PathTestBase
 
 
 class TestPathGeom(PathTestBase):
diff --git a/src/Mod/CAM/Tests/TestPathHelix.py b/src/Mod/CAM/CAMTests/TestPathHelix.py
similarity index 97%
rename from src/Mod/CAM/Tests/TestPathHelix.py
rename to src/Mod/CAM/CAMTests/TestPathHelix.py
index 239a779dbe..bd32272eb7 100644
--- a/src/Mod/CAM/Tests/TestPathHelix.py
+++ b/src/Mod/CAM/CAMTests/TestPathHelix.py
@@ -25,7 +25,7 @@ import FreeCAD
 import Path
 import Path.Main.Job as PathJob
 import Path.Op.Helix as PathHelix
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 
 Path.Log.setLevel(Path.Log.Level.INFO, Path.Log.thisModule())
 # Path.Log.trackModule(Path.Log.thisModule())
@@ -36,7 +36,7 @@ class TestPathHelix(PathTestUtils.PathTestBase):
 
     def setUp(self):
         self.clone = None
-        self.doc = FreeCAD.open(FreeCAD.getHomePath() + "Mod/CAM/Tests/test_holes00.fcstd")
+        self.doc = FreeCAD.open(FreeCAD.getHomePath() + "Mod/CAM/CAMTests/test_holes00.fcstd")
         self.job = PathJob.Create("Job", [self.doc.Body])
 
     def tearDown(self):
@@ -84,7 +84,7 @@ class TestPathHelix(PathTestUtils.PathTestBase):
 
         for deg in range(self.RotateBy, 360, self.RotateBy):
             self.tearDown()
-            self.doc = FreeCAD.open(FreeCAD.getHomePath() + "Mod/CAM/Tests/test_holes00.fcstd")
+            self.doc = FreeCAD.open(FreeCAD.getHomePath() + "Mod/CAM/CAMTests/test_holes00.fcstd")
             self.doc.Body.Placement.Rotation = FreeCAD.Rotation(deg, 0, 0)
 
             self.job = PathJob.Create("Job", [self.doc.Body])
@@ -107,7 +107,7 @@ class TestPathHelix(PathTestUtils.PathTestBase):
         """Verify Helix generates proper holes for rotated clone base model"""
         for deg in range(self.RotateBy, 360, self.RotateBy):
             self.tearDown()
-            self.doc = FreeCAD.open(FreeCAD.getHomePath() + "Mod/CAM/Tests/test_holes00.fcstd")
+            self.doc = FreeCAD.open(FreeCAD.getHomePath() + "Mod/CAM/CAMTests/test_holes00.fcstd")
             self.clone = Draft.clone(self.doc.Body)
             self.clone.Placement.Rotation = FreeCAD.Rotation(deg, 0, 0)
 
diff --git a/src/Mod/CAM/Tests/TestPathHelixGenerator.py b/src/Mod/CAM/CAMTests/TestPathHelixGenerator.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestPathHelixGenerator.py
rename to src/Mod/CAM/CAMTests/TestPathHelixGenerator.py
index e8eef6c282..867b680d52 100644
--- a/src/Mod/CAM/Tests/TestPathHelixGenerator.py
+++ b/src/Mod/CAM/CAMTests/TestPathHelixGenerator.py
@@ -24,7 +24,7 @@ import FreeCAD
 import Part
 import Path
 import Path.Base.Generator.helix as generator
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 
 
 Path.Log.setLevel(Path.Log.Level.INFO, Path.Log.thisModule())
diff --git a/src/Mod/CAM/Tests/TestPathHelpers.py b/src/Mod/CAM/CAMTests/TestPathHelpers.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestPathHelpers.py
rename to src/Mod/CAM/CAMTests/TestPathHelpers.py
index 082f4a6748..ce556e2ecc 100644
--- a/src/Mod/CAM/Tests/TestPathHelpers.py
+++ b/src/Mod/CAM/CAMTests/TestPathHelpers.py
@@ -29,7 +29,7 @@ import Path.Tool.Bit as PathToolBit
 import Path.Tool.Controller as PathToolController
 import PathScripts.PathUtils as PathUtils
 
-from Tests.PathTestUtils import PathTestBase
+from CAMTests.PathTestUtils import PathTestBase
 
 
 def createTool(name="t1", diameter=1.75):
diff --git a/src/Mod/CAM/Tests/TestPathLanguage.py b/src/Mod/CAM/CAMTests/TestPathLanguage.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestPathLanguage.py
rename to src/Mod/CAM/CAMTests/TestPathLanguage.py
index 90b06085a1..a521d9b872 100644
--- a/src/Mod/CAM/Tests/TestPathLanguage.py
+++ b/src/Mod/CAM/CAMTests/TestPathLanguage.py
@@ -21,7 +21,7 @@
 # ***************************************************************************
 
 import Path.Base.Language as PathLanguage
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 import math
 
 PI = math.pi
diff --git a/src/Mod/CAM/Tests/TestPathLog.py b/src/Mod/CAM/CAMTests/TestPathLog.py
similarity index 100%
rename from src/Mod/CAM/Tests/TestPathLog.py
rename to src/Mod/CAM/CAMTests/TestPathLog.py
diff --git a/src/Mod/CAM/Tests/TestPathOpDeburr.py b/src/Mod/CAM/CAMTests/TestPathOpDeburr.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestPathOpDeburr.py
rename to src/Mod/CAM/CAMTests/TestPathOpDeburr.py
index 0663b9ff52..dc911b0b86 100644
--- a/src/Mod/CAM/Tests/TestPathOpDeburr.py
+++ b/src/Mod/CAM/CAMTests/TestPathOpDeburr.py
@@ -23,7 +23,7 @@
 import Path
 import Path.Op.Deburr as PathDeburr
 import Path.Tool.Bit as PathToolBit
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 
 Path.Log.setLevel(Path.Log.Level.INFO, Path.Log.thisModule())
 # Path.Log.trackModule(Path.Log.thisModule())
diff --git a/src/Mod/CAM/Tests/TestPathOpUtil.py b/src/Mod/CAM/CAMTests/TestPathOpUtil.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestPathOpUtil.py
rename to src/Mod/CAM/CAMTests/TestPathOpUtil.py
index d7ec189d25..25902e232c 100644
--- a/src/Mod/CAM/Tests/TestPathOpUtil.py
+++ b/src/Mod/CAM/CAMTests/TestPathOpUtil.py
@@ -24,7 +24,7 @@ import FreeCAD
 import Part
 import Path
 import Path.Op.Util as PathOpUtil
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 import math
 
 from FreeCAD import Vector
@@ -32,7 +32,7 @@ from FreeCAD import Vector
 Path.Log.setLevel(Path.Log.Level.INFO, Path.Log.thisModule())
 # Path.Log.trackModule(Path.Log.thisModule())
 
-DOC = FreeCAD.getHomePath() + "Mod/CAM/Tests/test_geomop.fcstd"
+DOC = FreeCAD.getHomePath() + "Mod/CAM/CAMTests/test_geomop.fcstd"
 
 
 def getWire(obj, nr=0):
diff --git a/src/Mod/CAM/Tests/TestPathPost.py b/src/Mod/CAM/CAMTests/TestPathPost.py
similarity index 98%
rename from src/Mod/CAM/Tests/TestPathPost.py
rename to src/Mod/CAM/CAMTests/TestPathPost.py
index 469c371d3c..b4b7dc563a 100644
--- a/src/Mod/CAM/Tests/TestPathPost.py
+++ b/src/Mod/CAM/CAMTests/TestPathPost.py
@@ -83,12 +83,12 @@ class TestFileNameGenerator(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        # cls.doc = FreeCAD.open(FreeCAD.getHomePath() + "/Mod/CAM/Tests/boxtest.fcstd")
+        # cls.doc = FreeCAD.open(FreeCAD.getHomePath() + "/Mod/CAM/CAMTests/boxtest.fcstd")
         # cls.job = cls.doc.getObject("Job")
 
         FreeCAD.ConfigSet("SuppressRecomputeRequiredDialog", "True")
 
-        cls.testfile = FreeCAD.getHomePath() + "Mod/CAM/Tests/test_filenaming.fcstd"
+        cls.testfile = FreeCAD.getHomePath() + "Mod/CAM/CAMTests/test_filenaming.fcstd"
         cls.testfilepath, cls.testfilename = os.path.split(cls.testfile)
         cls.testfilename, cls.ext = os.path.splitext(cls.testfilename)
 
@@ -120,7 +120,7 @@ class TestFileNameGenerator(unittest.TestCase):
     #         self.assertEqual(generated_filename, expected_filename)
 
     # def setUp(self):
-    #     self.testfile = FreeCAD.getHomePath() + "Mod/CAM/Tests/test_filenaming.fcstd"
+    #     self.testfile = FreeCAD.getHomePath() + "Mod/CAM/CAMTests/test_filenaming.fcstd"
     #     self.testfilepath, self.testfilename = os.path.split(self.testfile)
     #     self.testfilename, self.ext = os.path.splitext(self.testfilename)
 
@@ -276,7 +276,7 @@ class TestResolvingPostProcessorName(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         FreeCAD.ConfigSet("SuppressRecomputeRequiredDialog", "True")
-        cls.doc = FreeCAD.open(FreeCAD.getHomePath() + "/Mod/CAM/Tests/boxtest.fcstd")
+        cls.doc = FreeCAD.open(FreeCAD.getHomePath() + "/Mod/CAM/CAMTests/boxtest.fcstd")
         cls.job = cls.doc.getObject("Job")
 
     @classmethod
@@ -333,7 +333,7 @@ class TestPostProcessorFactory(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         FreeCAD.ConfigSet("SuppressRecomputeRequiredDialog", "True")
-        cls.doc = FreeCAD.open(FreeCAD.getHomePath() + "/Mod/CAM/Tests/boxtest.fcstd")
+        cls.doc = FreeCAD.open(FreeCAD.getHomePath() + "/Mod/CAM/CAMTests/boxtest.fcstd")
         cls.job = cls.doc.getObject("Job")
 
     @classmethod
@@ -367,7 +367,7 @@ class TestPostProcessorClass(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         FreeCAD.ConfigSet("SuppressRecomputeRequiredDialog", "True")
-        cls.doc = FreeCAD.open(FreeCAD.getHomePath() + "/Mod/CAM/Tests/boxtest.fcstd")
+        cls.doc = FreeCAD.open(FreeCAD.getHomePath() + "/Mod/CAM/CAMTests/boxtest.fcstd")
         cls.job = cls.doc.getObject("Job")
 
     @classmethod
@@ -407,7 +407,7 @@ class TestPostProcessorClass(unittest.TestCase):
 #     """Test old-school posts"""
 
 #     def setUp(self):
-#         self.doc = FreeCAD.open(FreeCAD.getHomePath() + "/Mod/CAM/Tests/boxtest.fcstd")
+#         self.doc = FreeCAD.open(FreeCAD.getHomePath() + "/Mod/CAM/CAMTests/boxtest.fcstd")
 #         self.job = self.doc.getObject("Job")
 #         post = PostProcessorFactory.get_post_processor(self.job, "linuxcnc")
 #         results = post.export()
@@ -417,7 +417,7 @@ class TestPostProcessorClass(unittest.TestCase):
 
 ##
 ## You can run just this test using:
-## ./FreeCAD -c -t Tests.TestPathPost.TestPathPost.test_postprocessors
+## ./FreeCAD -c -t CAMTests.TestPathPost.TestPathPost.test_postprocessors
 ##
 # def test_postprocessors(self):
 #    """Test the postprocessors."""
@@ -473,7 +473,7 @@ class TestPostProcessorClass(unittest.TestCase):
 #    # Enough of the path to where the tests are stored so that
 #    # they can be found by the python interpreter.
 #    #
-#    PATHTESTS_LOCATION = "Mod/CAM/Tests"
+#    PATHTESTS_LOCATION = "Mod/CAM/CAMTests"
 #    #
 #    # The following code tries to re-use an open FreeCAD document
 #    # as much as possible.  It compares the current document with
@@ -613,7 +613,7 @@ class TestBuildPostList(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         FreeCAD.ConfigSet("SuppressRecomputeRequiredDialog", "True")
-        cls.testfile = FreeCAD.getHomePath() + "Mod/CAM/Tests/test_filenaming.fcstd"
+        cls.testfile = FreeCAD.getHomePath() + "Mod/CAM/CAMTests/test_filenaming.fcstd"
         cls.doc = FreeCAD.open(cls.testfile)
         FreeCAD.ConfigSet("SuppressRecomputeRequiredDialog", "")
         cls.job = cls.doc.getObjectsByLabel("MainJob")[0]
diff --git a/src/Mod/CAM/Tests/TestPathPreferences.py b/src/Mod/CAM/CAMTests/TestPathPreferences.py
similarity index 98%
rename from src/Mod/CAM/Tests/TestPathPreferences.py
rename to src/Mod/CAM/CAMTests/TestPathPreferences.py
index 8102fe7aa6..af4a490784 100644
--- a/src/Mod/CAM/Tests/TestPathPreferences.py
+++ b/src/Mod/CAM/CAMTests/TestPathPreferences.py
@@ -21,7 +21,7 @@
 # ***************************************************************************
 
 import Path
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 
 
 class TestPathPreferences(PathTestUtils.PathTestBase):
diff --git a/src/Mod/CAM/Tests/TestPathProfile.py b/src/Mod/CAM/CAMTests/TestPathProfile.py
similarity index 98%
rename from src/Mod/CAM/Tests/TestPathProfile.py
rename to src/Mod/CAM/CAMTests/TestPathProfile.py
index d6be87bb1f..b233b3e051 100644
--- a/src/Mod/CAM/Tests/TestPathProfile.py
+++ b/src/Mod/CAM/CAMTests/TestPathProfile.py
@@ -27,8 +27,8 @@ import FreeCAD
 import Part
 import Path.Op.Profile as PathProfile
 import Path.Main.Job as PathJob
-from Tests.PathTestUtils import PathTestBase
-from Tests.TestPathAdaptive import getGcodeMoves
+from CAMTests.PathTestUtils import PathTestBase
+from CAMTests.TestPathAdaptive import getGcodeMoves
 
 if FreeCAD.GuiUp:
     import Path.Main.Gui.Job as PathJobGui
@@ -55,7 +55,7 @@ class TestPathProfile(PathTestBase):
         # Open existing FreeCAD document with test geometry
         cls.needsInit = False
         FreeCAD.ConfigSet("SuppressRecomputeRequiredDialog", "True")
-        cls.doc = FreeCAD.open(FreeCAD.getHomePath() + "Mod/CAM/Tests/test_profile.fcstd")
+        cls.doc = FreeCAD.open(FreeCAD.getHomePath() + "Mod/CAM/CAMTests/test_profile.fcstd")
         FreeCAD.ConfigSet("SuppressRecomputeRequiredDialog", "")
 
         # Create Job object, adding geometry objects from file opened above
diff --git a/src/Mod/CAM/Tests/TestPathPropertyBag.py b/src/Mod/CAM/CAMTests/TestPathPropertyBag.py
similarity index 98%
rename from src/Mod/CAM/Tests/TestPathPropertyBag.py
rename to src/Mod/CAM/CAMTests/TestPathPropertyBag.py
index 34311e45f9..0cf14f129a 100644
--- a/src/Mod/CAM/Tests/TestPathPropertyBag.py
+++ b/src/Mod/CAM/CAMTests/TestPathPropertyBag.py
@@ -22,7 +22,7 @@
 
 import FreeCAD
 import Path.Base.PropertyBag as PathPropertyBag
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 
 
 class TestPathPropertyBag(PathTestUtils.PathTestBase):
diff --git a/src/Mod/CAM/Tests/TestPathRotationGenerator.py b/src/Mod/CAM/CAMTests/TestPathRotationGenerator.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestPathRotationGenerator.py
rename to src/Mod/CAM/CAMTests/TestPathRotationGenerator.py
index bb196899c6..4033bcd263 100644
--- a/src/Mod/CAM/Tests/TestPathRotationGenerator.py
+++ b/src/Mod/CAM/CAMTests/TestPathRotationGenerator.py
@@ -23,7 +23,7 @@
 import FreeCAD
 import Path
 import Path.Base.Generator.rotation as generator
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 import numpy as np
 
 Path.Log.setLevel(Path.Log.Level.INFO, Path.Log.thisModule())
diff --git a/src/Mod/CAM/Tests/TestPathSetupSheet.py b/src/Mod/CAM/CAMTests/TestPathSetupSheet.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestPathSetupSheet.py
rename to src/Mod/CAM/CAMTests/TestPathSetupSheet.py
index c81b80dda2..007b99114c 100644
--- a/src/Mod/CAM/Tests/TestPathSetupSheet.py
+++ b/src/Mod/CAM/CAMTests/TestPathSetupSheet.py
@@ -28,7 +28,7 @@ import sys
 
 # Path.Log.setLevel(Path.Log.Level.DEBUG, Path.Log.thisModule())
 
-from Tests.PathTestUtils import PathTestBase
+from CAMTests.PathTestUtils import PathTestBase
 
 
 def refstring(string):
diff --git a/src/Mod/CAM/Tests/TestPathStock.py b/src/Mod/CAM/CAMTests/TestPathStock.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestPathStock.py
rename to src/Mod/CAM/CAMTests/TestPathStock.py
index 877f63099c..582133025f 100644
--- a/src/Mod/CAM/Tests/TestPathStock.py
+++ b/src/Mod/CAM/CAMTests/TestPathStock.py
@@ -23,7 +23,7 @@
 import FreeCAD
 import Path.Main.Stock as PathStock
 
-from Tests.PathTestUtils import PathTestBase
+from CAMTests.PathTestUtils import PathTestBase
 
 
 class FakeJobProxy:
diff --git a/src/Mod/CAM/Tests/TestPathThreadMilling.py b/src/Mod/CAM/CAMTests/TestPathThreadMilling.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestPathThreadMilling.py
rename to src/Mod/CAM/CAMTests/TestPathThreadMilling.py
index 84ad39caa8..0bed15f411 100644
--- a/src/Mod/CAM/Tests/TestPathThreadMilling.py
+++ b/src/Mod/CAM/CAMTests/TestPathThreadMilling.py
@@ -25,7 +25,7 @@ import Path
 import Path.Op.ThreadMilling as PathThreadMilling
 import math
 
-from Tests.PathTestUtils import PathTestBase
+from CAMTests.PathTestUtils import PathTestBase
 
 
 class TestObject(object):
diff --git a/src/Mod/CAM/Tests/TestPathThreadMillingGenerator.py b/src/Mod/CAM/CAMTests/TestPathThreadMillingGenerator.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestPathThreadMillingGenerator.py
rename to src/Mod/CAM/CAMTests/TestPathThreadMillingGenerator.py
index 6c606c5591..d3c48322a0 100644
--- a/src/Mod/CAM/Tests/TestPathThreadMillingGenerator.py
+++ b/src/Mod/CAM/CAMTests/TestPathThreadMillingGenerator.py
@@ -24,7 +24,7 @@ import FreeCAD
 import Path.Base.Generator.threadmilling as threadmilling
 import math
 
-from Tests.PathTestUtils import PathTestBase
+from CAMTests.PathTestUtils import PathTestBase
 
 
 def radii(internal, major, minor, toolDia, toolCrest):
diff --git a/src/Mod/CAM/Tests/TestPathToolBit.py b/src/Mod/CAM/CAMTests/TestPathToolBit.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestPathToolBit.py
rename to src/Mod/CAM/CAMTests/TestPathToolBit.py
index bc2dd33891..90f3400fbb 100644
--- a/src/Mod/CAM/Tests/TestPathToolBit.py
+++ b/src/Mod/CAM/CAMTests/TestPathToolBit.py
@@ -21,7 +21,7 @@
 # ***************************************************************************
 
 import Path.Tool.Bit as PathToolBit
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 import glob
 import os
 
diff --git a/src/Mod/CAM/Tests/TestPathToolChangeGenerator.py b/src/Mod/CAM/CAMTests/TestPathToolChangeGenerator.py
similarity index 98%
rename from src/Mod/CAM/Tests/TestPathToolChangeGenerator.py
rename to src/Mod/CAM/CAMTests/TestPathToolChangeGenerator.py
index 22b25b795e..d542fb32ed 100644
--- a/src/Mod/CAM/Tests/TestPathToolChangeGenerator.py
+++ b/src/Mod/CAM/CAMTests/TestPathToolChangeGenerator.py
@@ -22,7 +22,7 @@
 
 import Path
 import Path.Base.Generator.toolchange as generator
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 
 Path.Log.setLevel(Path.Log.Level.DEBUG, Path.Log.thisModule())
 Path.Log.trackModule(Path.Log.thisModule())
diff --git a/src/Mod/CAM/Tests/TestPathToolController.py b/src/Mod/CAM/CAMTests/TestPathToolController.py
similarity index 98%
rename from src/Mod/CAM/Tests/TestPathToolController.py
rename to src/Mod/CAM/CAMTests/TestPathToolController.py
index 7f6c76a040..2214b60734 100644
--- a/src/Mod/CAM/Tests/TestPathToolController.py
+++ b/src/Mod/CAM/CAMTests/TestPathToolController.py
@@ -25,7 +25,7 @@ import Path
 import Path.Tool.Bit as PathToolBit
 import Path.Tool.Controller as PathToolController
 
-from Tests.PathTestUtils import PathTestBase
+from CAMTests.PathTestUtils import PathTestBase
 
 
 class TestPathToolController(PathTestBase):
diff --git a/src/Mod/CAM/Tests/TestPathUtil.py b/src/Mod/CAM/CAMTests/TestPathUtil.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestPathUtil.py
rename to src/Mod/CAM/CAMTests/TestPathUtil.py
index c69eefe27b..e34bc64238 100644
--- a/src/Mod/CAM/Tests/TestPathUtil.py
+++ b/src/Mod/CAM/CAMTests/TestPathUtil.py
@@ -24,7 +24,7 @@ import FreeCAD
 import Path.Base.Util as PathUtil
 import TestSketcherApp
 
-from Tests.PathTestUtils import PathTestBase
+from CAMTests.PathTestUtils import PathTestBase
 
 
 class TestPathUtil(PathTestBase):
diff --git a/src/Mod/CAM/Tests/TestPathVcarve.py b/src/Mod/CAM/CAMTests/TestPathVcarve.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestPathVcarve.py
rename to src/Mod/CAM/CAMTests/TestPathVcarve.py
index e66a461162..42ddbf3509 100644
--- a/src/Mod/CAM/Tests/TestPathVcarve.py
+++ b/src/Mod/CAM/CAMTests/TestPathVcarve.py
@@ -25,7 +25,7 @@ import Path.Op.Vcarve as PathVcarve
 import Path.Tool.Bit as PathToolBit
 import math
 
-from Tests.PathTestUtils import PathTestBase
+from CAMTests.PathTestUtils import PathTestBase
 
 
 class VbitTool(object):
diff --git a/src/Mod/CAM/Tests/TestPathVoronoi.py b/src/Mod/CAM/CAMTests/TestPathVoronoi.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestPathVoronoi.py
rename to src/Mod/CAM/CAMTests/TestPathVoronoi.py
index 9960961671..b5e7249a15 100644
--- a/src/Mod/CAM/Tests/TestPathVoronoi.py
+++ b/src/Mod/CAM/CAMTests/TestPathVoronoi.py
@@ -23,7 +23,7 @@
 import FreeCAD
 import Part
 import Path
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 
 vd = None
 
diff --git a/src/Mod/CAM/Tests/TestRefactoredCentroidPost.py b/src/Mod/CAM/CAMTests/TestRefactoredCentroidPost.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestRefactoredCentroidPost.py
rename to src/Mod/CAM/CAMTests/TestRefactoredCentroidPost.py
index 67335d31e3..8598ec8366 100644
--- a/src/Mod/CAM/Tests/TestRefactoredCentroidPost.py
+++ b/src/Mod/CAM/CAMTests/TestRefactoredCentroidPost.py
@@ -26,7 +26,7 @@ from importlib import reload
 import FreeCAD
 
 import Path
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 from Path.Post.scripts import refactored_centroid_post as postprocessor
 
 
diff --git a/src/Mod/CAM/Tests/TestRefactoredGrblPost.py b/src/Mod/CAM/CAMTests/TestRefactoredGrblPost.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestRefactoredGrblPost.py
rename to src/Mod/CAM/CAMTests/TestRefactoredGrblPost.py
index 744ebf1585..36069494cc 100644
--- a/src/Mod/CAM/Tests/TestRefactoredGrblPost.py
+++ b/src/Mod/CAM/CAMTests/TestRefactoredGrblPost.py
@@ -26,7 +26,7 @@ from importlib import reload
 import FreeCAD
 
 import Path
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 from Path.Post.scripts import refactored_grbl_post as postprocessor
 
 
diff --git a/src/Mod/CAM/Tests/TestRefactoredLinuxCNCPost.py b/src/Mod/CAM/CAMTests/TestRefactoredLinuxCNCPost.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestRefactoredLinuxCNCPost.py
rename to src/Mod/CAM/CAMTests/TestRefactoredLinuxCNCPost.py
index 7be0228787..15f4e1d22f 100644
--- a/src/Mod/CAM/Tests/TestRefactoredLinuxCNCPost.py
+++ b/src/Mod/CAM/CAMTests/TestRefactoredLinuxCNCPost.py
@@ -26,7 +26,7 @@ from importlib import reload
 import FreeCAD
 
 import Path
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 from Path.Post.scripts import refactored_linuxcnc_post as postprocessor
 
 
diff --git a/src/Mod/CAM/Tests/TestRefactoredMach3Mach4Post.py b/src/Mod/CAM/CAMTests/TestRefactoredMach3Mach4Post.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestRefactoredMach3Mach4Post.py
rename to src/Mod/CAM/CAMTests/TestRefactoredMach3Mach4Post.py
index eaced27070..ebceb4d9bc 100644
--- a/src/Mod/CAM/Tests/TestRefactoredMach3Mach4Post.py
+++ b/src/Mod/CAM/CAMTests/TestRefactoredMach3Mach4Post.py
@@ -26,7 +26,7 @@ from importlib import reload
 import FreeCAD
 
 import Path
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 from Path.Post.scripts import refactored_mach3_mach4_post as postprocessor
 
 Path.Log.setLevel(Path.Log.Level.DEBUG, Path.Log.thisModule())
diff --git a/src/Mod/CAM/Tests/TestRefactoredTestPost.py b/src/Mod/CAM/CAMTests/TestRefactoredTestPost.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestRefactoredTestPost.py
rename to src/Mod/CAM/CAMTests/TestRefactoredTestPost.py
index b51d6b2e9a..36b28521c4 100644
--- a/src/Mod/CAM/Tests/TestRefactoredTestPost.py
+++ b/src/Mod/CAM/CAMTests/TestRefactoredTestPost.py
@@ -24,7 +24,7 @@
 import FreeCAD
 
 import Path
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 from Path.Post.scripts import refactored_test_post as postprocessor
 
 
diff --git a/src/Mod/CAM/Tests/TestRefactoredTestPostGCodes.py b/src/Mod/CAM/CAMTests/TestRefactoredTestPostGCodes.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestRefactoredTestPostGCodes.py
rename to src/Mod/CAM/CAMTests/TestRefactoredTestPostGCodes.py
index 02029ad9d5..796db4bec4 100644
--- a/src/Mod/CAM/Tests/TestRefactoredTestPostGCodes.py
+++ b/src/Mod/CAM/CAMTests/TestRefactoredTestPostGCodes.py
@@ -24,7 +24,7 @@
 import FreeCAD
 
 import Path
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 from Path.Post.scripts import refactored_test_post as postprocessor
 
 
diff --git a/src/Mod/CAM/Tests/TestRefactoredTestPostMCodes.py b/src/Mod/CAM/CAMTests/TestRefactoredTestPostMCodes.py
similarity index 99%
rename from src/Mod/CAM/Tests/TestRefactoredTestPostMCodes.py
rename to src/Mod/CAM/CAMTests/TestRefactoredTestPostMCodes.py
index 756f41c565..ee140f6801 100644
--- a/src/Mod/CAM/Tests/TestRefactoredTestPostMCodes.py
+++ b/src/Mod/CAM/CAMTests/TestRefactoredTestPostMCodes.py
@@ -24,7 +24,7 @@
 import FreeCAD
 
 import Path
-import Tests.PathTestUtils as PathTestUtils
+import CAMTests.PathTestUtils as PathTestUtils
 from Path.Post.scripts import refactored_test_post as postprocessor
 
 
diff --git a/src/Mod/CAM/Tests/Tools/Bit/test-path-tool-bit-bit-00.fctb b/src/Mod/CAM/CAMTests/Tools/Bit/test-path-tool-bit-bit-00.fctb
similarity index 100%
rename from src/Mod/CAM/Tests/Tools/Bit/test-path-tool-bit-bit-00.fctb
rename to src/Mod/CAM/CAMTests/Tools/Bit/test-path-tool-bit-bit-00.fctb
diff --git a/src/Mod/CAM/Tests/Tools/Library/test-path-tool-bit-library-00.fctl b/src/Mod/CAM/CAMTests/Tools/Library/test-path-tool-bit-library-00.fctl
similarity index 100%
rename from src/Mod/CAM/Tests/Tools/Library/test-path-tool-bit-library-00.fctl
rename to src/Mod/CAM/CAMTests/Tools/Library/test-path-tool-bit-library-00.fctl
diff --git a/src/Mod/CAM/Tests/Tools/Shape/test-path-tool-bit-shape-00.fcstd b/src/Mod/CAM/CAMTests/Tools/Shape/test-path-tool-bit-shape-00.fcstd
similarity index 100%
rename from src/Mod/CAM/Tests/Tools/Shape/test-path-tool-bit-shape-00.fcstd
rename to src/Mod/CAM/CAMTests/Tools/Shape/test-path-tool-bit-shape-00.fcstd
diff --git a/src/Mod/CAM/Tests/__init__.py b/src/Mod/CAM/CAMTests/__init__.py
similarity index 100%
rename from src/Mod/CAM/Tests/__init__.py
rename to src/Mod/CAM/CAMTests/__init__.py
diff --git a/src/Mod/CAM/Tests/boxtest.fcstd b/src/Mod/CAM/CAMTests/boxtest.fcstd
similarity index 100%
rename from src/Mod/CAM/Tests/boxtest.fcstd
rename to src/Mod/CAM/CAMTests/boxtest.fcstd
diff --git a/src/Mod/CAM/Tests/boxtest1.fcstd b/src/Mod/CAM/CAMTests/boxtest1.fcstd
similarity index 100%
rename from src/Mod/CAM/Tests/boxtest1.fcstd
rename to src/Mod/CAM/CAMTests/boxtest1.fcstd
diff --git a/src/Mod/CAM/Tests/drill_test1.FCStd b/src/Mod/CAM/CAMTests/drill_test1.FCStd
similarity index 100%
rename from src/Mod/CAM/Tests/drill_test1.FCStd
rename to src/Mod/CAM/CAMTests/drill_test1.FCStd
diff --git a/src/Mod/CAM/Tests/test_adaptive.fcstd b/src/Mod/CAM/CAMTests/test_adaptive.fcstd
similarity index 100%
rename from src/Mod/CAM/Tests/test_adaptive.fcstd
rename to src/Mod/CAM/CAMTests/test_adaptive.fcstd
diff --git a/src/Mod/CAM/Tests/test_centroid_00.ngc b/src/Mod/CAM/CAMTests/test_centroid_00.ngc
similarity index 100%
rename from src/Mod/CAM/Tests/test_centroid_00.ngc
rename to src/Mod/CAM/CAMTests/test_centroid_00.ngc
diff --git a/src/Mod/CAM/Tests/test_filenaming.fcstd b/src/Mod/CAM/CAMTests/test_filenaming.fcstd
similarity index 100%
rename from src/Mod/CAM/Tests/test_filenaming.fcstd
rename to src/Mod/CAM/CAMTests/test_filenaming.fcstd
diff --git a/src/Mod/CAM/Tests/test_geomop.fcstd b/src/Mod/CAM/CAMTests/test_geomop.fcstd
similarity index 100%
rename from src/Mod/CAM/Tests/test_geomop.fcstd
rename to src/Mod/CAM/CAMTests/test_geomop.fcstd
diff --git a/src/Mod/CAM/Tests/test_holes00.fcstd b/src/Mod/CAM/CAMTests/test_holes00.fcstd
similarity index 100%
rename from src/Mod/CAM/Tests/test_holes00.fcstd
rename to src/Mod/CAM/CAMTests/test_holes00.fcstd
diff --git a/src/Mod/CAM/Tests/test_profile.fcstd b/src/Mod/CAM/CAMTests/test_profile.fcstd
similarity index 100%
rename from src/Mod/CAM/Tests/test_profile.fcstd
rename to src/Mod/CAM/CAMTests/test_profile.fcstd
diff --git a/src/Mod/CAM/CMakeLists.txt b/src/Mod/CAM/CMakeLists.txt
index 599e59f22e..ad349d54c6 100644
--- a/src/Mod/CAM/CMakeLists.txt
+++ b/src/Mod/CAM/CMakeLists.txt
@@ -287,66 +287,66 @@ SET(Tools_Shape_SRCS
 )
 
 SET(Tests_SRCS
-    Tests/__init__.py
-    Tests/boxtest.fcstd
-    Tests/boxtest1.fcstd
-    Tests/Drilling_1.FCStd
-    Tests/drill_test1.FCStd
-    Tests/FilePathTestUtils.py
-    Tests/PathTestUtils.py
-    Tests/test_adaptive.fcstd
-    Tests/test_profile.fcstd
-    Tests/test_centroid_00.ngc
-    Tests/test_filenaming.fcstd
-    Tests/test_geomop.fcstd
-    Tests/test_holes00.fcstd
-    Tests/TestCAMSanity.py
-    Tests/TestCentroidPost.py
-    Tests/TestGrblPost.py
-    Tests/TestLinuxCNCPost.py
-    Tests/TestMach3Mach4Post.py
-    Tests/TestPathAdaptive.py
-    Tests/TestPathCore.py
-    Tests/TestPathDepthParams.py
-    Tests/TestPathDressupDogbone.py
-    Tests/TestPathDressupDogboneII.py
-    Tests/TestPathDressupHoldingTags.py
-    Tests/TestPathDrillGenerator.py
-    Tests/TestPathDrillable.py
-    Tests/TestPathGeneratorDogboneII.py
-    Tests/TestPathGeom.py
-    Tests/TestPathHelix.py
-    Tests/TestPathHelpers.py
-    Tests/TestPathHelixGenerator.py
-    Tests/TestPathLanguage.py
-    Tests/TestPathLog.py
-    Tests/TestPathOpDeburr.py
-    Tests/TestPathOpUtil.py
-    Tests/TestPathPost.py
-    Tests/TestPathPreferences.py
-    Tests/TestPathProfile.py
-    Tests/TestPathPropertyBag.py
-    Tests/TestPathRotationGenerator.py
-    Tests/TestPathSetupSheet.py
-    Tests/TestPathStock.py
-    Tests/TestPathToolChangeGenerator.py
-    Tests/TestPathThreadMilling.py
-    Tests/TestPathThreadMillingGenerator.py
-    Tests/TestPathToolBit.py
-    Tests/TestPathToolController.py
-    Tests/TestPathUtil.py
-    Tests/TestPathVcarve.py
-    Tests/TestPathVoronoi.py
-    Tests/TestRefactoredCentroidPost.py
-    Tests/TestRefactoredGrblPost.py
-    Tests/TestRefactoredLinuxCNCPost.py
-    Tests/TestRefactoredMach3Mach4Post.py
-    Tests/TestRefactoredTestPost.py
-    Tests/TestRefactoredTestPostGCodes.py
-    Tests/TestRefactoredTestPostMCodes.py
-    Tests/Tools/Bit/test-path-tool-bit-bit-00.fctb
-    Tests/Tools/Library/test-path-tool-bit-library-00.fctl
-    Tests/Tools/Shape/test-path-tool-bit-shape-00.fcstd
+    CAMTests/__init__.py
+    CAMTests/boxtest.fcstd
+    CAMTests/boxtest1.fcstd
+    CAMTests/Drilling_1.FCStd
+    CAMTests/drill_test1.FCStd
+    CAMTests/FilePathTestUtils.py
+    CAMTests/PathTestUtils.py
+    CAMTests/test_adaptive.fcstd
+    CAMTests/test_profile.fcstd
+    CAMTests/test_centroid_00.ngc
+    CAMTests/test_filenaming.fcstd
+    CAMTests/test_geomop.fcstd
+    CAMTests/test_holes00.fcstd
+    CAMTests/TestCAMSanity.py
+    CAMTests/TestCentroidPost.py
+    CAMTests/TestGrblPost.py
+    CAMTests/TestLinuxCNCPost.py
+    CAMTests/TestMach3Mach4Post.py
+    CAMTests/TestPathAdaptive.py
+    CAMTests/TestPathCore.py
+    CAMTests/TestPathDepthParams.py
+    CAMTests/TestPathDressupDogbone.py
+    CAMTests/TestPathDressupDogboneII.py
+    CAMTests/TestPathDressupHoldingTags.py
+    CAMTests/TestPathDrillGenerator.py
+    CAMTests/TestPathDrillable.py
+    CAMTests/TestPathGeneratorDogboneII.py
+    CAMTests/TestPathGeom.py
+    CAMTests/TestPathHelix.py
+    CAMTests/TestPathHelpers.py
+    CAMTests/TestPathHelixGenerator.py
+    CAMTests/TestPathLanguage.py
+    CAMTests/TestPathLog.py
+    CAMTests/TestPathOpDeburr.py
+    CAMTests/TestPathOpUtil.py
+    CAMTests/TestPathPost.py
+    CAMTests/TestPathPreferences.py
+    CAMTests/TestPathProfile.py
+    CAMTests/TestPathPropertyBag.py
+    CAMTests/TestPathRotationGenerator.py
+    CAMTests/TestPathSetupSheet.py
+    CAMTests/TestPathStock.py
+    CAMTests/TestPathToolChangeGenerator.py
+    CAMTests/TestPathThreadMilling.py
+    CAMTests/TestPathThreadMillingGenerator.py
+    CAMTests/TestPathToolBit.py
+    CAMTests/TestPathToolController.py
+    CAMTests/TestPathUtil.py
+    CAMTests/TestPathVcarve.py
+    CAMTests/TestPathVoronoi.py
+    CAMTests/TestRefactoredCentroidPost.py
+    CAMTests/TestRefactoredGrblPost.py
+    CAMTests/TestRefactoredLinuxCNCPost.py
+    CAMTests/TestRefactoredMach3Mach4Post.py
+    CAMTests/TestRefactoredTestPost.py
+    CAMTests/TestRefactoredTestPostGCodes.py
+    CAMTests/TestRefactoredTestPostMCodes.py
+    CAMTests/Tools/Bit/test-path-tool-bit-bit-00.fctb
+    CAMTests/Tools/Library/test-path-tool-bit-library-00.fctl
+    CAMTests/Tools/Shape/test-path-tool-bit-shape-00.fcstd
 )
 
 SET(PathImages_Ops
@@ -533,14 +533,14 @@ INSTALL(
     FILES
         ${Tests_SRCS}
     DESTINATION
-        Mod/CAM/Tests
+        Mod/CAM/CAMTests
 )
 
 INSTALL(
   DIRECTORY
-      Tests/Tools
+      CAMTests/Tools
   DESTINATION
-        Mod/CAM/Tests
+        Mod/CAM/CAMTests
 )
 
 
diff --git a/src/Mod/CAM/TestCAMApp.py b/src/Mod/CAM/TestCAMApp.py
index fc917045d4..2d6e6ae860 100644
--- a/src/Mod/CAM/TestCAMApp.py
+++ b/src/Mod/CAM/TestCAMApp.py
@@ -22,63 +22,63 @@
 
 import TestApp
 
-from Tests.TestCAMSanity import TestCAMSanity
-from Tests.TestPathProfile import TestPathProfile
+from CAMTests.TestCAMSanity import TestCAMSanity
+from CAMTests.TestPathProfile import TestPathProfile
 
-from Tests.TestPathAdaptive import TestPathAdaptive
-from Tests.TestPathCore import TestPathCore
-from Tests.TestPathDepthParams import depthTestCases
-from Tests.TestPathDressupDogbone import TestDressupDogbone
-from Tests.TestPathDressupDogboneII import TestDressupDogboneII
-from Tests.TestPathDressupHoldingTags import TestHoldingTags
-from Tests.TestPathDrillable import TestPathDrillable
-from Tests.TestPathDrillGenerator import TestPathDrillGenerator
-from Tests.TestPathGeneratorDogboneII import TestGeneratorDogboneII
-from Tests.TestPathGeom import TestPathGeom
-from Tests.TestPathLanguage import TestPathLanguage
-from Tests.TestPathOpDeburr import TestPathOpDeburr
+from CAMTests.TestPathAdaptive import TestPathAdaptive
+from CAMTests.TestPathCore import TestPathCore
+from CAMTests.TestPathDepthParams import depthTestCases
+from CAMTests.TestPathDressupDogbone import TestDressupDogbone
+from CAMTests.TestPathDressupDogboneII import TestDressupDogboneII
+from CAMTests.TestPathDressupHoldingTags import TestHoldingTags
+from CAMTests.TestPathDrillable import TestPathDrillable
+from CAMTests.TestPathDrillGenerator import TestPathDrillGenerator
+from CAMTests.TestPathGeneratorDogboneII import TestGeneratorDogboneII
+from CAMTests.TestPathGeom import TestPathGeom
+from CAMTests.TestPathLanguage import TestPathLanguage
+from CAMTests.TestPathOpDeburr import TestPathOpDeburr
 
-# from Tests.TestPathHelix import TestPathHelix
-from Tests.TestPathHelpers import TestPathHelpers
-from Tests.TestPathHelixGenerator import TestPathHelixGenerator
-from Tests.TestPathLog import TestPathLog
-from Tests.TestPathOpUtil import TestPathOpUtil
+# from CAMTests.TestPathHelix import TestPathHelix
+from CAMTests.TestPathHelpers import TestPathHelpers
+from CAMTests.TestPathHelixGenerator import TestPathHelixGenerator
+from CAMTests.TestPathLog import TestPathLog
+from CAMTests.TestPathOpUtil import TestPathOpUtil
 
-# from Tests.TestPathPost import TestPathPost
-from Tests.TestPathPost import TestPathPostUtils
-from Tests.TestPathPost import TestBuildPostList
+# from CAMTests.TestPathPost import TestPathPost
+from CAMTests.TestPathPost import TestPathPostUtils
+from CAMTests.TestPathPost import TestBuildPostList
 
-# from Tests.TestPathPost import TestOutputNameSubstitution
-from Tests.TestPathPost import TestPostProcessorFactory
-from Tests.TestPathPost import TestResolvingPostProcessorName
-from Tests.TestPathPost import TestFileNameGenerator
+# from CAMTests.TestPathPost import TestOutputNameSubstitution
+from CAMTests.TestPathPost import TestPostProcessorFactory
+from CAMTests.TestPathPost import TestResolvingPostProcessorName
+from CAMTests.TestPathPost import TestFileNameGenerator
 
-from Tests.TestPathPreferences import TestPathPreferences
-from Tests.TestPathProfile import TestPathProfile
-from Tests.TestPathPropertyBag import TestPathPropertyBag
-from Tests.TestPathRotationGenerator import TestPathRotationGenerator
-from Tests.TestPathSetupSheet import TestPathSetupSheet
-from Tests.TestPathStock import TestPathStock
-from Tests.TestPathThreadMilling import TestPathThreadMilling
-from Tests.TestPathThreadMillingGenerator import TestPathThreadMillingGenerator
-from Tests.TestPathToolBit import TestPathToolBit
-from Tests.TestPathToolChangeGenerator import TestPathToolChangeGenerator
-from Tests.TestPathToolController import TestPathToolController
-from Tests.TestPathUtil import TestPathUtil
-from Tests.TestPathVcarve import TestPathVcarve
-from Tests.TestPathVoronoi import TestPathVoronoi
+from CAMTests.TestPathPreferences import TestPathPreferences
+from CAMTests.TestPathProfile import TestPathProfile
+from CAMTests.TestPathPropertyBag import TestPathPropertyBag
+from CAMTests.TestPathRotationGenerator import TestPathRotationGenerator
+from CAMTests.TestPathSetupSheet import TestPathSetupSheet
+from CAMTests.TestPathStock import TestPathStock
+from CAMTests.TestPathThreadMilling import TestPathThreadMilling
+from CAMTests.TestPathThreadMillingGenerator import TestPathThreadMillingGenerator
+from CAMTests.TestPathToolBit import TestPathToolBit
+from CAMTests.TestPathToolChangeGenerator import TestPathToolChangeGenerator
+from CAMTests.TestPathToolController import TestPathToolController
+from CAMTests.TestPathUtil import TestPathUtil
+from CAMTests.TestPathVcarve import TestPathVcarve
+from CAMTests.TestPathVoronoi import TestPathVoronoi
 
-from Tests.TestCentroidPost import TestCentroidPost
-from Tests.TestGrblPost import TestGrblPost
-from Tests.TestLinuxCNCPost import TestLinuxCNCPost
-from Tests.TestMach3Mach4Post import TestMach3Mach4Post
-from Tests.TestRefactoredCentroidPost import TestRefactoredCentroidPost
-from Tests.TestRefactoredGrblPost import TestRefactoredGrblPost
-from Tests.TestRefactoredLinuxCNCPost import TestRefactoredLinuxCNCPost
-from Tests.TestRefactoredMach3Mach4Post import TestRefactoredMach3Mach4Post
-from Tests.TestRefactoredTestPost import TestRefactoredTestPost
-from Tests.TestRefactoredTestPostGCodes import TestRefactoredTestPostGCodes
-from Tests.TestRefactoredTestPostMCodes import TestRefactoredTestPostMCodes
+from CAMTests.TestCentroidPost import TestCentroidPost
+from CAMTests.TestGrblPost import TestGrblPost
+from CAMTests.TestLinuxCNCPost import TestLinuxCNCPost
+from CAMTests.TestMach3Mach4Post import TestMach3Mach4Post
+from CAMTests.TestRefactoredCentroidPost import TestRefactoredCentroidPost
+from CAMTests.TestRefactoredGrblPost import TestRefactoredGrblPost
+from CAMTests.TestRefactoredLinuxCNCPost import TestRefactoredLinuxCNCPost
+from CAMTests.TestRefactoredMach3Mach4Post import TestRefactoredMach3Mach4Post
+from CAMTests.TestRefactoredTestPost import TestRefactoredTestPost
+from CAMTests.TestRefactoredTestPostGCodes import TestRefactoredTestPostGCodes
+from CAMTests.TestRefactoredTestPostMCodes import TestRefactoredTestPostMCodes
 
 # dummy usage to get flake8 and lgtm quiet
 False if TestCAMSanity.__name__ else True