diff --git a/src/Mod/Fem/TestFem.py b/src/Mod/Fem/TestFem.py
index ded057e795..e95dc21f55 100644
--- a/src/Mod/Fem/TestFem.py
+++ b/src/Mod/Fem/TestFem.py
@@ -27,18 +27,19 @@
 # Unit test for the FEM module
 # the order should be as follows:
 # common-, object-, mesh-, inout-, ccxtools-, solverframworktests
-from femtest.testcommon import FemCommon
-from femtest.testobject import FemObject
-from femtest.testmesh import FemMeshTest
-from femtest.testmesh import TestEleTetra10
-from femtest.testccxtools import FemCcxAnalysisTest
-from femtest.testsolverframework import SolverFrameWorkTest
+from femtest.testcommon import TestFemCommon
+from femtest.testobject import TestObjectCreate
+from femtest.testobject import TestObjectType
+from femtest.testmesh import TestMeshCommon
+from femtest.testmesh import TestMeshEleTetra10
+from femtest.testccxtools import TestCcxTools
+from femtest.testsolverframework import TestSolverFrameWork
 
 
 # For more information on how to run a specific test class or a test method see 
 # file src/Mod/Test/__init__ and forum https://forum.freecadweb.org/viewtopic.php?f=10&t=22190#p175546
 
-# It may be useful to temporary comment FreeCAD.closeDocument("FemCommon") in tearDown method to not close the document
+# It may be useful to temporary comment FreeCAD.closeDocument(self.doc_name) in tearDown method to not close the document
 
 
 '''
@@ -53,11 +54,11 @@ Test.runTestsFromModule(femtest.testcommon)
 
 # class
 import Test, femtest.testcommon
-Test.runTestsFromClass(femtest.testcommon.FemCommon)
+Test.runTestsFromClass(femtest.testcommon.TestFemCommon)
 
 # method
 import unittest
-mytest = unittest.TestLoader().loadTestsFromName("femtest.testcommon.FemCommon.test_pyimport_all_FEM_modules")
+mytest = unittest.TestLoader().loadTestsFromName("femtest.testcommon.TestFemCommon.test_pyimport_all_FEM_modules")
 unittest.TextTestRunner().run(mytest)
 
 
@@ -77,9 +78,9 @@ unittest.TextTestRunner().run(mytest)
 ./bin/FreeCAD --run-test "femtest.testtools"
 
 # class
-./bin/FreeCAD --run-test "femtest.testcommon.FemCommon"
+./bin/FreeCAD --run-test "femtest.testcommon.TestFemCommon"
 
 # method
-./bin/FreeCAD --run-test "femtest.testcommon.FemCommon.test_pyimport_all_FEM_modules"
+./bin/FreeCAD --run-test "femtest.testcommon.TestFemCommon.test_pyimport_all_FEM_modules"
 
 '''
diff --git a/src/Mod/Fem/femtest/testccxtools.py b/src/Mod/Fem/femtest/testccxtools.py
index 0116573f0f..4c2964d88c 100644
--- a/src/Mod/Fem/femtest/testccxtools.py
+++ b/src/Mod/Fem/femtest/testccxtools.py
@@ -32,11 +32,11 @@ from . import testtools
 from .testtools import fcc_print
 
 
-class FemCcxAnalysisTest(unittest.TestCase):
-    fcc_print('import FemCcxAnalysisTest')
+class TestCcxTools(unittest.TestCase):
+    fcc_print('import TestCcxTools')
 
     def setUp(self):
-        self.doc_name = "TestsFemCcxTools"
+        self.doc_name = "TestCcxTools"
         try:
             FreeCAD.setActiveDocument(self.doc_name)
         except:
diff --git a/src/Mod/Fem/femtest/testcommon.py b/src/Mod/Fem/femtest/testcommon.py
index 0badd1ad2d..5da0a2a858 100644
--- a/src/Mod/Fem/femtest/testcommon.py
+++ b/src/Mod/Fem/femtest/testcommon.py
@@ -30,8 +30,8 @@ from . import testtools
 from .testtools import fcc_print
 
 
-class FemCommon(unittest.TestCase):
-    fcc_print('import FemCommon')
+class TestFemCommon(unittest.TestCase):
+    fcc_print('import TestFemCommon')
 
     def setUp(self):
         self.doc_name = "TestsFemCommon"
diff --git a/src/Mod/Fem/femtest/testmesh.py b/src/Mod/Fem/femtest/testmesh.py
index 368c8824de..93c784b134 100644
--- a/src/Mod/Fem/femtest/testmesh.py
+++ b/src/Mod/Fem/femtest/testmesh.py
@@ -30,11 +30,11 @@ from . import testtools
 from .testtools import fcc_print
 
 
-class FemMeshTest(unittest.TestCase):
-    fcc_print('import FemMeshTest')
+class TestMeshCommon(unittest.TestCase):
+    fcc_print('import TestMeshCommon')
 
     def setUp(self):
-        self.doc_name = "TestsFemMesh"
+        self.doc_name = "TestMeshCommon"
         try:
             FreeCAD.setActiveDocument(self.doc_name)
         except:
@@ -138,11 +138,11 @@ class FemMeshTest(unittest.TestCase):
         pass
 
 
-class TestEleTetra10(unittest.TestCase):
-    fcc_print('import TestEleTetra10')
+class TestMeshEleTetra10(unittest.TestCase):
+    fcc_print('import TestMeshEleTetra10')
 
     def setUp(self):
-        self.doc_name = "TestEleTetra10"
+        self.doc_name = "TestMeshEleTetra10"
         try:
             FreeCAD.setActiveDocument(self.doc_name)
         except:
diff --git a/src/Mod/Fem/femtest/testobject.py b/src/Mod/Fem/femtest/testobject.py
index 820f33142b..def71c6bdf 100644
--- a/src/Mod/Fem/femtest/testobject.py
+++ b/src/Mod/Fem/femtest/testobject.py
@@ -30,11 +30,11 @@ from . import testtools
 from .testtools import fcc_print
 
 
-class FemObject(unittest.TestCase):
-    fcc_print('import FemObject')
+class TestObjectCreate(unittest.TestCase):
+    fcc_print('import TestObjectCreate')
 
     def setUp(self):
-        self.doc_name = "TestsFemObject"
+        self.doc_name = "TestObjectCreate"
         try:
             FreeCAD.setActiveDocument(self.doc_name)
         except:
@@ -103,6 +103,24 @@ class FemObject(unittest.TestCase):
         doc.recompute()
         self.assertEqual(len(analysis.Group), testtools.get_defmake_count() - 1)  # because of the analysis itself count -1
 
+    def tearDown(self):
+        FreeCAD.closeDocument(self.doc_name)
+        pass
+
+
+class TestObjectType(unittest.TestCase):
+    fcc_print('import TestObjectType')
+
+    def setUp(self):
+        self.doc_name = "TestObjectType"
+        try:
+            FreeCAD.setActiveDocument(self.doc_name)
+        except:
+            FreeCAD.newDocument(self.doc_name)
+        finally:
+            FreeCAD.setActiveDocument(self.doc_name)
+        self.active_doc = FreeCAD.ActiveDocument
+
     def test_femobjects_type(self):
         doc = self.active_doc
 
diff --git a/src/Mod/Fem/femtest/testsolverframework.py b/src/Mod/Fem/femtest/testsolverframework.py
index 3c24db36f4..641eb7e361 100644
--- a/src/Mod/Fem/femtest/testsolverframework.py
+++ b/src/Mod/Fem/femtest/testsolverframework.py
@@ -31,11 +31,11 @@ from . import testtools
 from .testtools import fcc_print
 
 
-class SolverFrameWorkTest(unittest.TestCase):
-    fcc_print('import SolverFrameWorkTest')
+class TestSolverFrameWork(unittest.TestCase):
+    fcc_print('import TestSolverFrameWork')
 
     def setUp(self):
-        self.doc_name = "TestsFemSolverFrameWork"
+        self.doc_name = "TestSolverFrameWork"
         try:
             FreeCAD.setActiveDocument(self.doc_name)
         except: