diff --git a/Makefile b/Makefile
index e055c388..a10d3901 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,8 @@
 
 include Makefile.config
 
-CYCLONE = cyclone
-TESTSCM = unit-tests
+CYCLONE = ../cyclone-bootstrap/cyclone -A . -A ../cyclone-bootstrap
+TESTSCM = unit-tests srfi-60-tests
 TESTFILES = $(addprefix tests/, $(addsuffix .scm, $(TESTSCM)))
 BOOTSTRAP_DIR = ../cyclone-bootstrap
 
@@ -175,7 +175,7 @@ examples:
 
 .PHONY: test
 test: $(TESTFILES) $(CYCLONE) $(COBJECTS)
-	$(foreach f,$(TESTSCM), echo tests/$(f) ; ./cyclone -A . tests/$(f).scm && tests/$(f) && rm -rf tests/$(f);)
+	$(foreach f,$(TESTSCM), echo tests/$(f) ; $(CYCLONE) tests/$(f).scm && tests/$(f) && rm -rf tests/$(f);)
 
 .PHONY: tags
 tags:
diff --git a/test.txt b/test.txt
new file mode 100644
index 00000000..b5754e20
--- /dev/null
+++ b/test.txt
@@ -0,0 +1 @@
+ok
\ No newline at end of file