diff --git a/Makefile b/Makefile
index bbde37b5428c5aaf9020c3a47f1d3a2bb80c71b6..0e40bc05bb24d1928623ab1ecc8da415393fa8c0 100644
--- a/Makefile
+++ b/Makefile
@@ -63,6 +63,7 @@ COPY = \
 	clutter \
 	common \
 	dbus \
+	firewall \
 	folks \
 	grilo \
 	inherit-config.sh \
diff --git a/common/firewall.yaml b/common/firewall.yaml
index 7764602c92a313f599939d12ef8b0bf278ed8c14..a4385c9f7d0013f4c6a7cef54dd3be8a069f3f4e 100644
--- a/common/firewall.yaml
+++ b/common/firewall.yaml
@@ -10,13 +10,9 @@ metadata:
   environment:
   - lava-test-shell
 
-install:
-  deps:
-  - chaiwala-tests
-
 run:
   steps:
-    - common/run-test-in-systemd --timeout=900 --name=run-test env DEBUG=2 /usr/share/chaiwala-tests/firewall/automated/run-test.sh
+    - common/run-test-in-systemd --timeout=900 --name=run-test env DEBUG=2 firewall/automated/run-test.sh
 
 parse:
   pattern: ^(?P<test_case_id>[a-zA-Z0-9_\-\./]+):\s*(?P<result>pass|fail|skip|unknown)$
diff --git a/debian/apertis-tests.install b/debian/apertis-tests.install
index 818475a02dc05a480be6dbe4bf9f46c57e0e0373..11f4ecad2d0bdc3618d44627d2f280f64279f338 100644
--- a/debian/apertis-tests.install
+++ b/debian/apertis-tests.install
@@ -12,6 +12,7 @@ usr/lib/apertis-tests/clutter
 usr/lib/apertis-tests/common
 usr/lib/apertis-tests/dbus
 usr/lib/apertis-tests/grilo
+usr/lib/apertis-tests/firewall
 usr/lib/apertis-tests/folks
 usr/lib/apertis-tests/inherit-config.sh
 usr/lib/apertis-tests/libreoffice