diff --git a/Makefile.in b/Makefile.in
index 31b23d5ef..50b73522b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -302,7 +302,8 @@ doc/refman.pdf: doc
 #
 
 test: $(PROGRAMS) fish_tests
-	./fish_tests; cd tests; ../fish <test.fish;
+	./fish_tests
+	cd tests; ../fish <test.fish;
 .PHONY: test
 
 
diff --git a/tests/test.fish b/tests/test.fish
index 6d2ce42c0..2b796ef8d 100755
--- a/tests/test.fish
+++ b/tests/test.fish
@@ -40,11 +40,11 @@ if [ "$argv" != '-n' ]
 
   if test $res = ok;
 	echo File test.fish tested ok
+        exit 0
   else
 	echo File test.fish failed tests
+        exit 1
   end;
-
-  exit
 end
 
 echo Testing high level script functionality