diff --git a/2024/bonus/day01/sample.tftest.hcl b/2024/bonus/day01/sample.tftest.hcl
deleted file mode 100644
index ed219ea..0000000
--- a/2024/bonus/day01/sample.tftest.hcl
+++ /dev/null
@@ -1,19 +0,0 @@
-variables {
-  input = file("../../tests/samples/01.txt")
-}
-
-run "run" {
-
-  command = plan
-
-  assert {
-    condition     = output.part1 == 11
-    error_message = "Part1 output is wrong"
-  }
-
-  assert {
-    condition     = output.part2 == 31
-    error_message = "Part2 output is wrong"
-  }
-
-}
diff --git a/2024/bonus/day02/sample.tftest.hcl b/2024/bonus/day02/sample.tftest.hcl
deleted file mode 100644
index d8c4b53..0000000
--- a/2024/bonus/day02/sample.tftest.hcl
+++ /dev/null
@@ -1,19 +0,0 @@
-variables {
-  input = file("../../tests/samples/02.txt")
-}
-
-run "run" {
-
-  command = plan
-
-  assert {
-    condition     = output.part1 == 2
-    error_message = "Part1 output is wrong"
-  }
-
-  assert {
-    condition     = output.part2 == 4
-    error_message = "Part2 output is wrong"
-  }
-
-}
diff --git a/2024/bonus/tests.tftest.hcl b/2024/bonus/tests.tftest.hcl
new file mode 100644
index 0000000..341da75
--- /dev/null
+++ b/2024/bonus/tests.tftest.hcl
@@ -0,0 +1,43 @@
+run "day1" {
+  command = plan
+  module {
+    source = "./day01"
+  }
+
+  variables {
+    input = file("../tests/samples/01.txt")
+  }
+
+  assert {
+    condition     = output.part1 == 11
+    error_message = "Part1 output is wrong"
+  }
+
+  assert {
+    condition     = output.part2 == 31
+    error_message = "Part2 output is wrong"
+  }
+}
+
+run "day2" {
+  command = plan
+
+  module {
+    source = "./day02"
+  }
+
+  variables {
+    input = file("../tests/samples/02.txt")
+  }
+
+  assert {
+    condition     = output.part1 == 2
+    error_message = "Part1 output is wrong"
+  }
+
+  assert {
+    condition     = output.part2 == 4
+    error_message = "Part2 output is wrong"
+  }
+
+}