diff --git a/python/tests/test_Orientation.py b/python/tests/test_Orientation.py
new file mode 100644
index 000000000..08f060887
--- /dev/null
+++ b/python/tests/test_Orientation.py
@@ -0,0 +1,65 @@
+import os
+from itertools import permutations
+
+import pytest
+import numpy as np
+
+import damask
+from damask import Rotation
+from damask import Orientation
+from damask import Lattice
+   
+n = 1000
+
+@pytest.fixture
+def default():
+    """A set of n random rotations."""
+    return [Rotation.fromRandom() for r in range(n)]
+
+@pytest.fixture
+def reference_dir(reference_dir_base):
+    """Directory containing reference results."""
+    return os.path.join(reference_dir_base,'Rotation')
+
+
+class TestOrientation:
+
+    @pytest.mark.parametrize('color',[{'label':'red',  'RGB':[1,0,0],'direction':[0,0,1]},
+                                      {'label':'green','RGB':[0,1,0],'direction':[0,1,1]},
+                                      {'label':'blue', 'RGB':[0,0,1],'direction':[1,1,1]}])
+    @pytest.mark.parametrize('lattice',['fcc','bcc'])
+    def test_IPF_cubic(self,default,color,lattice):
+        cube = damask.Orientation(damask.Rotation(),lattice)
+        for direction in set(permutations(np.array(color['direction']))):
+            assert np.allclose(cube.IPFcolor(direction),np.array(color['RGB']))
+
+    @pytest.mark.parametrize('lattice',Lattice.lattices)
+    def test_IPF(self,lattice):
+        direction = np.random.random(3)*2.0-1
+        for rot in [Rotation.fromRandom() for r in range(n//100)]:
+            R = damask.Orientation(rot,lattice)
+            color = R.IPFcolor(direction)
+            for equivalent in R.equivalentOrientations():
+                assert np.allclose(color,R.IPFcolor(direction))
+
+    @pytest.mark.parametrize('model',['Bain','KS','GT','GT_prime','NW','Pitsch'])
+    @pytest.mark.parametrize('lattice',['fcc','bcc'])
+    def test_relationship_forward_backward(self,model,lattice):
+        ori = Orientation(Rotation.fromRandom(),lattice)
+        for i,r in enumerate(ori.relatedOrientations(model)):
+            ori2 = r.relatedOrientations(model)[i]
+            misorientation = ori.rotation.misorientation(ori2.rotation)
+            assert misorientation.asAxisAngle(degrees=True)[3]<1.0e-5
+
+    @pytest.mark.parametrize('model',['Bain','KS','GT','GT_prime','NW','Pitsch'])
+    @pytest.mark.parametrize('lattice',['fcc','bcc'])
+    def test_relationship_reference(self,update,reference_dir,model,lattice):
+        reference = os.path.join(reference_dir,'{}_{}.txt'.format(lattice,model))
+        ori = Orientation(Rotation(),lattice)
+        eu = np.array([o.rotation.asEulers(degrees=True) for o in ori.relatedOrientations(model)])
+        if update: 
+            coords = np.array([(1,i+1) for i,x in enumerate(eu)])
+            table = damask.Table(eu,{'Eulers':(3,)})
+            table.add('pos',coords)
+            table.to_ASCII(reference)
+        assert np.allclose(eu,damask.Table.from_ASCII(reference).get('Eulers'))
diff --git a/python/tests/test_Rotation.py b/python/tests/test_Rotation.py
index 012c95469..dd9e20363 100644
--- a/python/tests/test_Rotation.py
+++ b/python/tests/test_Rotation.py
@@ -6,8 +6,6 @@ import numpy as np
 
 import damask
 from damask import Rotation
-from damask import Orientation
-from damask import Lattice
    
 n = 1000
 
@@ -58,44 +56,3 @@ class TestRotation:
         for rot in default:
             assert np.allclose(rot.asCubochoric(),
                                Rotation.fromQuaternion(rot.asQuaternion()).asCubochoric())
-
-
-    @pytest.mark.parametrize('color',[{'label':'red',  'RGB':[1,0,0],'direction':[0,0,1]},
-                                      {'label':'green','RGB':[0,1,0],'direction':[0,1,1]},
-                                      {'label':'blue', 'RGB':[0,0,1],'direction':[1,1,1]}])
-    @pytest.mark.parametrize('lattice',['fcc','bcc'])
-    def test_IPF_cubic(self,default,color,lattice):
-        cube = damask.Orientation(damask.Rotation(),lattice)
-        for direction in set(permutations(np.array(color['direction']))):
-            assert np.allclose(cube.IPFcolor(direction),np.array(color['RGB']))
-
-    @pytest.mark.parametrize('lattice',Lattice.lattices)
-    def test_IPF(self,lattice):
-        direction = np.random.random(3)*2.0-1
-        for rot in [Rotation.fromRandom() for r in range(n//100)]:
-            R = damask.Orientation(rot,lattice)
-            color = R.IPFcolor(direction)
-            for equivalent in R.equivalentOrientations():
-                assert np.allclose(color,R.IPFcolor(direction))
-
-    @pytest.mark.parametrize('model',['Bain','KS','GT','GT_prime','NW','Pitsch'])
-    @pytest.mark.parametrize('lattice',['fcc','bcc'])
-    def test_relationship_forward_backward(self,model,lattice):
-        ori = Orientation(Rotation.fromRandom(),lattice)
-        for i,r in enumerate(ori.relatedOrientations(model)):
-            ori2 = r.relatedOrientations(model)[i]
-            misorientation = ori.rotation.misorientation(ori2.rotation)
-            assert misorientation.asAxisAngle(degrees=True)[3]<1.0e-5
-
-    @pytest.mark.parametrize('model',['Bain','KS','GT','GT_prime','NW','Pitsch'])
-    @pytest.mark.parametrize('lattice',['fcc','bcc'])
-    def test_relationship_reference(self,update,reference_dir,model,lattice):
-        reference = os.path.join(reference_dir,'{}_{}.txt'.format(lattice,model))
-        ori = Orientation(Rotation(),lattice)
-        eu = np.array([o.rotation.asEulers(degrees=True) for o in ori.relatedOrientations(model)])
-        if update: 
-            coords = np.array([(1,i+1) for i,x in enumerate(eu)])
-            table = damask.Table(eu,{'Eulers':(3,)})
-            table.add('pos',coords)
-            table.to_ASCII(reference)
-        assert np.allclose(eu,damask.Table.from_ASCII(reference).get('Eulers'))