diff --git a/test/dsl/__init__.py b/test/dsl/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e1f7e6e8bf04d3d59cff68b83d91fbf791f0faa2
--- /dev/null
+++ b/test/dsl/__init__.py
@@ -0,0 +1,2 @@
+#! /usr/bin/env python
+# -*- coding: utf-8 -*-
diff --git a/test/test_evaluator.py b/test/dsl/test_evaluator.py
similarity index 100%
rename from test/test_evaluator.py
rename to test/dsl/test_evaluator.py
diff --git a/test/test_generic.py b/test/dsl/test_generic.py
similarity index 100%
rename from test/test_generic.py
rename to test/dsl/test_generic.py
diff --git a/test/flagger/__init__.py b/test/flagger/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e1f7e6e8bf04d3d59cff68b83d91fbf791f0faa2
--- /dev/null
+++ b/test/flagger/__init__.py
@@ -0,0 +1,2 @@
+#! /usr/bin/env python
+# -*- coding: utf-8 -*-
diff --git a/test/test_flagger.py b/test/flagger/test_dmpflagger.py
similarity index 95%
rename from test/test_flagger.py
rename to test/flagger/test_dmpflagger.py
index 7b3e283a31ca2ca07d6e77b30a5e28253ae5cb89..c4c0491a543762dc35af49d64a601c8a530e9a0b 100644
--- a/test/test_flagger.py
+++ b/test/flagger/test_dmpflagger.py
@@ -2,12 +2,12 @@
 # -*- coding: utf-8 -*-
 
 import pandas as pd
-from test.common import initData
+from ..common import initData
 from core import runner, prepareMeta
 from flagger.dmpflagger import DmpFlagger, FlagFields
 
 
-def test_DmpFlagger():
+def test_basic():
 
     data = initData()
     var1, var2, *_ = data.columns
@@ -67,5 +67,5 @@ def test_flagOrder():
 
 if __name__ == "__main__":
 
-    test_DmpFlagger()
+    test_basic()
     test_flagOrder()