diff --git a/ci-build.sh b/ci-build.sh
index 3d236441d6664bac2dc512112ddc10742d3e9991..1828210237358ecbb38b5c82a26536f112281781 100644
--- a/ci-build.sh
+++ b/ci-build.sh
@@ -4,4 +4,4 @@ set -e
 
 # Quad Libraries and Boot image
 (cd quad && make)
-#(cd groundStation && make) 
+#(cd groundStation && make)
diff --git a/ci-test.sh b/ci-test.sh
index 61d28b9155431dcc434b683b09ab33f32ebf82d1..c79ad9703580d64f4db35e914c7d5c2eb7134fb6 100644
--- a/ci-test.sh
+++ b/ci-test.sh
@@ -1,11 +1,7 @@
 #!/bin/bash
 
 set -e
-
-# Quad Library Unit tests
-(cd quad && make && make test)
-
-# Quad functional safety tests
 export PATH=/usr/local/bin:$PATH
-echo $(ruby --version)
-ruby quad/scripts/tests/test_safety_checks.rb
+
+# Quad
+(cd quad && make test)
diff --git a/quad/Makefile b/quad/Makefile
index 5b25b37be9cca2c8cdb93df1af8de5f4021f861c..98427ec8019f321f5b3307f764fbc2b857688570 100644
--- a/quad/Makefile
+++ b/quad/Makefile
@@ -34,10 +34,11 @@ boot: $(BOOT)
 run-virt-quad:
 	$(MAKE) -C src/virt_quad run
 
-test:
+test: all
 	$(MAKE) -C src/queue test
 	$(MAKE) -C src/computation_graph test
 	$(MAKE) -C src/quad_app test
+	ruby scripts/tests/test_safety_checks.rb
 
 clean:
 	rm -rf $(INCDIR) $(LIBDIR) $(OUTDIR) $(EXEDIR)