diff --git a/test/test_unitary/__init__.py b/test/test_unitary_r_packages/__init__.py
similarity index 100%
rename from test/test_unitary/__init__.py
rename to test/test_unitary_r_packages/__init__.py
diff --git a/test/test_unitary/test_fitmaxstab/__init__.py b/test/test_unitary_r_packages/test_spatial_extreme/__init__.py
similarity index 100%
rename from test/test_unitary/test_fitmaxstab/__init__.py
rename to test/test_unitary_r_packages/test_spatial_extreme/__init__.py
diff --git a/test/test_unitary/test_rmaxstab/__init__.py b/test/test_unitary_r_packages/test_spatial_extreme/test_fitmaxstab/__init__.py
similarity index 100%
rename from test/test_unitary/test_rmaxstab/__init__.py
rename to test/test_unitary_r_packages/test_spatial_extreme/test_fitmaxstab/__init__.py
diff --git a/test/test_unitary/test_fitmaxstab/test_fitmaxstab_with_margin.py b/test/test_unitary_r_packages/test_spatial_extreme/test_fitmaxstab/test_fitmaxstab_with_margin.py
similarity index 94%
rename from test/test_unitary/test_fitmaxstab/test_fitmaxstab_with_margin.py
rename to test/test_unitary_r_packages/test_spatial_extreme/test_fitmaxstab/test_fitmaxstab_with_margin.py
index a1ce0df0c5c7cc7062ba9945c5ec565abaa3eb16..a435d09f09863cb2a33e349546d3a4eb9bfcf299 100644
--- a/test/test_unitary/test_fitmaxstab/test_fitmaxstab_with_margin.py
+++ b/test/test_unitary_r_packages/test_spatial_extreme/test_fitmaxstab/test_fitmaxstab_with_margin.py
@@ -7,8 +7,8 @@ from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model impo
 from extreme_fit.model.max_stable_model.abstract_max_stable_model import CovarianceFunction
 from extreme_fit.model.max_stable_model.max_stable_models import Schlather
 from extreme_fit.model.utils import r
-from test.test_unitary.test_rmaxstab.test_rmaxstab_with_margin import TestRMaxStabWithMarginConstant
-from test.test_unitary.test_unitary_abstract import TestUnitaryAbstract
+from test.test_unitary_r_packages.test_spatial_extreme.test_rmaxstab.test_rmaxstab_with_margin import TestRMaxStabWithMarginConstant
+from test.test_unitary_r_packages.test_unitary_abstract import TestUnitaryAbstract
 
 
 class TestMaxStableFitWithConstantMargin(TestUnitaryAbstract):
diff --git a/test/test_unitary/test_fitmaxstab/test_fitmaxstab_without_margin.py b/test/test_unitary_r_packages/test_spatial_extreme/test_fitmaxstab/test_fitmaxstab_without_margin.py
similarity index 86%
rename from test/test_unitary/test_fitmaxstab/test_fitmaxstab_without_margin.py
rename to test/test_unitary_r_packages/test_spatial_extreme/test_fitmaxstab/test_fitmaxstab_without_margin.py
index d1877adbab0f5cf0559e62e82af3733e6b4e3159..b428d7a7242047ac53f749d670b487c4d0dfef63 100644
--- a/test/test_unitary/test_fitmaxstab/test_fitmaxstab_without_margin.py
+++ b/test/test_unitary_r_packages/test_spatial_extreme/test_fitmaxstab/test_fitmaxstab_without_margin.py
@@ -5,8 +5,8 @@ from extreme_fit.model.max_stable_model.abstract_max_stable_model import Covaria
 from extreme_fit.model.max_stable_model.max_stable_models import Schlather
 from extreme_fit.model.utils import r
 from spatio_temporal_dataset.dataset.simulation_dataset import MaxStableDataset
-from test.test_unitary.test_rmaxstab.test_rmaxstab_without_margin import TestRMaxStab
-from test.test_unitary.test_unitary_abstract import TestUnitaryAbstract
+from test.test_unitary_r_packages.test_spatial_extreme.test_rmaxstab.test_rmaxstab_without_margin import TestRMaxStab
+from test.test_unitary_r_packages.test_unitary_abstract import TestUnitaryAbstract
 
 
 class TestMaxStableFitWithoutMargin(TestUnitaryAbstract):
diff --git a/test/test_unitary_r_packages/test_spatial_extreme/test_rmaxstab/__init__.py b/test/test_unitary_r_packages/test_spatial_extreme/test_rmaxstab/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/test_unitary/test_rmaxstab/test_rmaxstab_with_margin.py b/test/test_unitary_r_packages/test_spatial_extreme/test_rmaxstab/test_rmaxstab_with_margin.py
similarity index 94%
rename from test/test_unitary/test_rmaxstab/test_rmaxstab_with_margin.py
rename to test/test_unitary_r_packages/test_spatial_extreme/test_rmaxstab/test_rmaxstab_with_margin.py
index c1570bd6f9cc65330e01793a290c07a15b725e21..df02dd5a3a2b0d53f5d53beaffcd3faae0a0d863 100644
--- a/test/test_unitary/test_rmaxstab/test_rmaxstab_with_margin.py
+++ b/test/test_unitary_r_packages/test_spatial_extreme/test_rmaxstab/test_rmaxstab_with_margin.py
@@ -7,8 +7,8 @@ from extreme_fit.model.margin_model.linear_margin_model.linear_margin_model impo
 from extreme_fit.model.utils import r
 from extreme_fit.distribution.gev.gev_params import GevParams
 from spatio_temporal_dataset.dataset.simulation_dataset import FullSimulatedDataset
-from test.test_unitary.test_rmaxstab.test_rmaxstab_without_margin import TestRMaxStab
-from test.test_unitary.test_unitary_abstract import TestUnitaryAbstract
+from test.test_unitary_r_packages.test_spatial_extreme.test_rmaxstab.test_rmaxstab_without_margin import TestRMaxStab
+from test.test_unitary_r_packages.test_unitary_abstract import TestUnitaryAbstract
 
 
 class TestRMaxStabWithMarginConstant(TestUnitaryAbstract):
diff --git a/test/test_unitary/test_rmaxstab/test_rmaxstab_without_margin.py b/test/test_unitary_r_packages/test_spatial_extreme/test_rmaxstab/test_rmaxstab_without_margin.py
similarity index 95%
rename from test/test_unitary/test_rmaxstab/test_rmaxstab_without_margin.py
rename to test/test_unitary_r_packages/test_spatial_extreme/test_rmaxstab/test_rmaxstab_without_margin.py
index 42bc01e2bb43fe0767e1ed2e3808fe4393de25cf..5e32c74009af2be983b6d841110818e7fdd6eb63 100644
--- a/test/test_unitary/test_rmaxstab/test_rmaxstab_without_margin.py
+++ b/test/test_unitary_r_packages/test_spatial_extreme/test_rmaxstab/test_rmaxstab_without_margin.py
@@ -10,7 +10,7 @@ from spatio_temporal_dataset.coordinates.abstract_coordinates import AbstractCoo
 from spatio_temporal_dataset.coordinates.spatial_coordinates.abstract_spatial_coordinates import \
     AbstractSpatialCoordinates
 from spatio_temporal_dataset.spatio_temporal_observations.annual_maxima_observations import MaxStableAnnualMaxima
-from test.test_unitary.test_unitary_abstract import TestUnitaryAbstract
+from test.test_unitary_r_packages.test_unitary_abstract import TestUnitaryAbstract
 
 
 class TestRMaxStab(TestUnitaryAbstract):
diff --git a/test/test_unitary/test_unitary_abstract.py b/test/test_unitary_r_packages/test_unitary_abstract.py
similarity index 100%
rename from test/test_unitary/test_unitary_abstract.py
rename to test/test_unitary_r_packages/test_unitary_abstract.py