diff --git a/test/system/annotationtest.py b/test/fluents/annotationtest.py
similarity index 100%
rename from test/system/annotationtest.py
rename to test/fluents/annotationtest.py
diff --git a/test/system/datasettest.py b/test/fluents/datasettest.py
similarity index 100%
rename from test/system/datasettest.py
rename to test/fluents/datasettest.py