diff --git a/tests/image_specific_tests/docker-stacks-foundation/run-hooks-change/a.sh b/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/change/a.sh
similarity index 100%
rename from tests/image_specific_tests/docker-stacks-foundation/run-hooks-change/a.sh
rename to tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/change/a.sh
diff --git a/tests/image_specific_tests/docker-stacks-foundation/run-hooks-change/b.sh b/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/change/b.sh
similarity index 100%
rename from tests/image_specific_tests/docker-stacks-foundation/run-hooks-change/b.sh
rename to tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/change/b.sh
diff --git a/tests/image_specific_tests/docker-stacks-foundation/run-hooks-change/c.sh b/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/change/c.sh
similarity index 100%
rename from tests/image_specific_tests/docker-stacks-foundation/run-hooks-change/c.sh
rename to tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/change/c.sh
diff --git a/tests/image_specific_tests/docker-stacks-foundation/run-hooks-executables/executable.py b/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/executables/executable.py
similarity index 100%
rename from tests/image_specific_tests/docker-stacks-foundation/run-hooks-executables/executable.py
rename to tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/executables/executable.py
diff --git a/tests/image_specific_tests/docker-stacks-foundation/run-hooks-executables/non_executable.py b/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/executables/non_executable.py
similarity index 100%
rename from tests/image_specific_tests/docker-stacks-foundation/run-hooks-executables/non_executable.py
rename to tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/executables/non_executable.py
diff --git a/tests/image_specific_tests/docker-stacks-foundation/run-hooks-executables/run-me.sh b/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/executables/run-me.sh
similarity index 100%
rename from tests/image_specific_tests/docker-stacks-foundation/run-hooks-executables/run-me.sh
rename to tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/executables/run-me.sh
diff --git a/tests/image_specific_tests/docker-stacks-foundation/run-hooks-failures/a.sh b/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/failures/a.sh
similarity index 100%
rename from tests/image_specific_tests/docker-stacks-foundation/run-hooks-failures/a.sh
rename to tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/failures/a.sh
diff --git a/tests/image_specific_tests/docker-stacks-foundation/run-hooks-failures/b.py b/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/failures/b.py
similarity index 100%
rename from tests/image_specific_tests/docker-stacks-foundation/run-hooks-failures/b.py
rename to tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/failures/b.py
diff --git a/tests/image_specific_tests/docker-stacks-foundation/run-hooks-failures/c.sh b/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/failures/c.sh
similarity index 100%
rename from tests/image_specific_tests/docker-stacks-foundation/run-hooks-failures/c.sh
rename to tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/failures/c.sh
diff --git a/tests/image_specific_tests/docker-stacks-foundation/run-hooks-failures/d.sh b/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/failures/d.sh
similarity index 100%
rename from tests/image_specific_tests/docker-stacks-foundation/run-hooks-failures/d.sh
rename to tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/failures/d.sh
diff --git a/tests/image_specific_tests/docker-stacks-foundation/run-hooks-unset/a.sh b/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/unset/a.sh
similarity index 100%
rename from tests/image_specific_tests/docker-stacks-foundation/run-hooks-unset/a.sh
rename to tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/unset/a.sh
diff --git a/tests/image_specific_tests/docker-stacks-foundation/run-hooks-unset/b.sh b/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/unset/b.sh
similarity index 100%
rename from tests/image_specific_tests/docker-stacks-foundation/run-hooks-unset/b.sh
rename to tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/unset/b.sh
diff --git a/tests/image_specific_tests/docker-stacks-foundation/run-hooks-unset/c.sh b/tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/unset/c.sh
similarity index 100%
rename from tests/image_specific_tests/docker-stacks-foundation/run-hooks-unset/c.sh
rename to tests/image_specific_tests/docker-stacks-foundation/data/run-hooks/unset/c.sh
diff --git a/tests/image_specific_tests/docker-stacks-foundation/test_run_hooks.py b/tests/image_specific_tests/docker-stacks-foundation/test_run_hooks.py
index 22806069..fcf7e1bf 100644
--- a/tests/image_specific_tests/docker-stacks-foundation/test_run_hooks.py
+++ b/tests/image_specific_tests/docker-stacks-foundation/test_run_hooks.py
@@ -100,7 +100,7 @@ def run_source_in_dir(
 def test_run_hooks_executables(container: TrackedContainer) -> None:
     logs = run_source_in_dir(
         container,
-        subdir="run-hooks-executables",
+        subdir="data/run-hooks/executables",
         command_suffix="&& echo SOME_VAR is ${SOME_VAR}",
     )
 
@@ -110,7 +110,9 @@ def test_run_hooks_executables(container: TrackedContainer) -> None:
 
 
 def test_run_hooks_with_failures(container: TrackedContainer) -> None:
-    logs = run_source_in_dir(container, subdir="run-hooks-failures", no_failure=False)
+    logs = run_source_in_dir(
+        container, subdir="data/run-hooks/failures", no_failure=False
+    )
 
     for file in ["a.sh", "b.py", "c.sh", "d.sh"]:
         assert f"Started: {file}" in logs
@@ -129,7 +131,7 @@ def test_run_hooks_with_failures(container: TrackedContainer) -> None:
 
 
 def test_run_hooks_unset(container: TrackedContainer) -> None:
-    logs = run_source_in_dir(container, subdir="run-hooks-unset")
+    logs = run_source_in_dir(container, subdir="data/run-hooks/unset")
 
     assert "Inside a.sh MY_VAR variable has 123 value" in logs
     assert "Inside b.sh MY_VAR variable has 123 value" in logs
@@ -138,7 +140,7 @@ def test_run_hooks_unset(container: TrackedContainer) -> None:
 
 
 def test_run_hooks_change(container: TrackedContainer) -> None:
-    logs = run_source_in_dir(container, subdir="run-hooks-change")
+    logs = run_source_in_dir(container, subdir="data/run-hooks/change")
 
     assert "Inside a.sh MY_VAR variable has 123 value" in logs
     assert "Inside b.sh MY_VAR variable has 123 value" in logs