24 files changed, 4 insertions, 1 deletions
diff --git a/tests/completions/completions.py b/tests/frontend/completions.py
index 6c75b31e2..0e4c6ad7e 100644
--- a/tests/completions/completions.py
+++ b/tests/frontend/completions.py
@@ -3,7 +3,10 @@ import pytest
 from tests.testutils import cli
 
 # Project directory
-DATA_DIR = os.path.dirname(os.path.realpath(__file__))
+DATA_DIR = os.path.join(
+    os.path.dirname(os.path.realpath(__file__)),
+    'completions'
+)
 
 MAIN_COMMANDS = [
     'artifact ',
diff --git a/tests/completions/no-element-path/compose-all.bst b/tests/frontend/completions/no-element-path/compose-all.bst
index ba47081b3..ba47081b3 100644
--- a/tests/completions/no-element-path/compose-all.bst
+++ b/tests/frontend/completions/no-element-path/compose-all.bst
diff --git a/tests/completions/no-element-path/compose-exclude-dev.bst b/tests/frontend/completions/no-element-path/compose-exclude-dev.bst
index 75c14378c..75c14378c 100644
--- a/tests/completions/no-element-path/compose-exclude-dev.bst
+++ b/tests/frontend/completions/no-element-path/compose-exclude-dev.bst
diff --git a/tests/completions/no-element-path/compose-include-bin.bst b/tests/frontend/completions/no-element-path/compose-include-bin.bst
index 9571203c6..9571203c6 100644
--- a/tests/completions/no-element-path/compose-include-bin.bst
+++ b/tests/frontend/completions/no-element-path/compose-include-bin.bst
diff --git a/tests/completions/no-element-path/files/bin-files/usr/bin/hello b/tests/frontend/completions/no-element-path/files/bin-files/usr/bin/hello
index f534a4083..f534a4083 100755
--- a/tests/completions/no-element-path/files/bin-files/usr/bin/hello
+++ b/tests/frontend/completions/no-element-path/files/bin-files/usr/bin/hello
diff --git a/tests/completions/no-element-path/files/dev-files/usr/include/pony.h b/tests/frontend/completions/no-element-path/files/dev-files/usr/include/pony.h
index 40bd0c2e7..40bd0c2e7 100644
--- a/tests/completions/no-element-path/files/dev-files/usr/include/pony.h
+++ b/tests/frontend/completions/no-element-path/files/dev-files/usr/include/pony.h
diff --git a/tests/completions/no-element-path/import-bin.bst b/tests/frontend/completions/no-element-path/import-bin.bst
index a847c0c23..a847c0c23 100644
--- a/tests/completions/no-element-path/import-bin.bst
+++ b/tests/frontend/completions/no-element-path/import-bin.bst
diff --git a/tests/completions/no-element-path/import-dev.bst b/tests/frontend/completions/no-element-path/import-dev.bst
index 152a54667..152a54667 100644
--- a/tests/completions/no-element-path/import-dev.bst
+++ b/tests/frontend/completions/no-element-path/import-dev.bst
diff --git a/tests/completions/no-element-path/project.conf b/tests/frontend/completions/no-element-path/project.conf
index e7e35e716..e7e35e716 100644
--- a/tests/completions/no-element-path/project.conf
+++ b/tests/frontend/completions/no-element-path/project.conf
diff --git a/tests/completions/no-element-path/target.bst b/tests/frontend/completions/no-element-path/target.bst
index b9432fafa..b9432fafa 100644
--- a/tests/completions/no-element-path/target.bst
+++ b/tests/frontend/completions/no-element-path/target.bst
diff --git a/tests/completions/project/elements/compose-all.bst b/tests/frontend/completions/project/elements/compose-all.bst
index ba47081b3..ba47081b3 100644
--- a/tests/completions/project/elements/compose-all.bst
+++ b/tests/frontend/completions/project/elements/compose-all.bst
diff --git a/tests/completions/project/elements/compose-exclude-dev.bst b/tests/frontend/completions/project/elements/compose-exclude-dev.bst
index 75c14378c..75c14378c 100644
--- a/tests/completions/project/elements/compose-exclude-dev.bst
+++ b/tests/frontend/completions/project/elements/compose-exclude-dev.bst
diff --git a/tests/completions/project/elements/compose-include-bin.bst b/tests/frontend/completions/project/elements/compose-include-bin.bst
index 9571203c6..9571203c6 100644
--- a/tests/completions/project/elements/compose-include-bin.bst
+++ b/tests/frontend/completions/project/elements/compose-include-bin.bst
diff --git a/tests/completions/project/elements/import-bin.bst b/tests/frontend/completions/project/elements/import-bin.bst
index a847c0c23..a847c0c23 100644
--- a/tests/completions/project/elements/import-bin.bst
+++ b/tests/frontend/completions/project/elements/import-bin.bst
diff --git a/tests/completions/project/elements/import-dev.bst b/tests/frontend/completions/project/elements/import-dev.bst
index 152a54667..152a54667 100644
--- a/tests/completions/project/elements/import-dev.bst
+++ b/tests/frontend/completions/project/elements/import-dev.bst
diff --git a/tests/completions/project/elements/target.bst b/tests/frontend/completions/project/elements/target.bst
index b9432fafa..b9432fafa 100644
--- a/tests/completions/project/elements/target.bst
+++ b/tests/frontend/completions/project/elements/target.bst
diff --git a/tests/completions/project/files/bin-files/usr/bin/hello b/tests/frontend/completions/project/files/bin-files/usr/bin/hello
index f534a4083..f534a4083 100755
--- a/tests/completions/project/files/bin-files/usr/bin/hello
+++ b/tests/frontend/completions/project/files/bin-files/usr/bin/hello
diff --git a/tests/completions/project/files/dev-files/usr/include/pony.h b/tests/frontend/completions/project/files/dev-files/usr/include/pony.h
index 40bd0c2e7..40bd0c2e7 100644
--- a/tests/completions/project/files/dev-files/usr/include/pony.h
+++ b/tests/frontend/completions/project/files/dev-files/usr/include/pony.h
diff --git a/tests/completions/project/project.conf b/tests/frontend/completions/project/project.conf
index 854e38693..854e38693 100644
--- a/tests/completions/project/project.conf
+++ b/tests/frontend/completions/project/project.conf
diff --git a/tests/completions/sub-folders/base/unwanted.bst b/tests/frontend/completions/sub-folders/base/unwanted.bst
index bd510513d..bd510513d 100644
--- a/tests/completions/sub-folders/base/unwanted.bst
+++ b/tests/frontend/completions/sub-folders/base/unwanted.bst
diff --git a/tests/completions/sub-folders/elements/base.bst b/tests/frontend/completions/sub-folders/elements/base.bst
index 4e97e8ac0..4e97e8ac0 100644
--- a/tests/completions/sub-folders/elements/base.bst
+++ b/tests/frontend/completions/sub-folders/elements/base.bst
diff --git a/tests/completions/sub-folders/elements/base/wanted.bst b/tests/frontend/completions/sub-folders/elements/base/wanted.bst
index 57656210d..57656210d 100644
--- a/tests/completions/sub-folders/elements/base/wanted.bst
+++ b/tests/frontend/completions/sub-folders/elements/base/wanted.bst
diff --git a/tests/completions/sub-folders/elements/hello.bst b/tests/frontend/completions/sub-folders/elements/hello.bst
index 93fcaa04b..93fcaa04b 100644
--- a/tests/completions/sub-folders/elements/hello.bst
+++ b/tests/frontend/completions/sub-folders/elements/hello.bst
diff --git a/tests/completions/sub-folders/project.conf b/tests/frontend/completions/sub-folders/project.conf
index 854e38693..854e38693 100644
--- a/tests/completions/sub-folders/project.conf
+++ b/tests/frontend/completions/sub-folders/project.conf