diff --git a/Makefile b/Makefile
index 4adde13..cdbbde4 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ TOPDIR=.
 include $(TOPDIR)/Makefile.config
 
 
-all: dumps user_lib tests
+all: dumps user_lib instruction_tests
 # 
 # Main targets
 #
@@ -18,8 +18,9 @@ dumps:
 user_lib:
 	$(MAKE) -C userlib/
 
-tests: user_lib
-	$(MAKE) tests -C test/riscv_instructions/
+syscall: user_lib
+	$(MAKE) build -C test/syscall_tests/
+	$(RM) test/syscall_tests/*.o
 	mkdir -p ${TOPDIR}/target/guac/
 	find . -name '*.guac' -exec mv {} ${TOPDIR}/target/guac/ \;
 
diff --git a/test/riscv_instructions/Makefile b/test/riscv_instructions/Makefile
index 029a205..7c9a691 100644
--- a/test/riscv_instructions/Makefile
+++ b/test/riscv_instructions/Makefile
@@ -2,22 +2,18 @@ build:
 	make build -C boolean_logic/
 	make build -C jump_instructions/
 	make build -C simple_arithmetics/
-	make build -C syscall_tests/
 
 dumps:
 	make dumps -C boolean_logic/
 	make dumps -C jump_instructions/
 	make dumps -C simple_arithmetics/
-	make dumps -C syscall_tests/
 
 tests:
 	make tests -C boolean_logic/
 	make tests -C jump_instructions/
 	make tests -C simple_arithmetics/
-	make tests -C syscall_tests/
 
 clean:
 	$(MAKE) clean -C boolean_logic/
 	$(MAKE) clean -C jump_instructions/
-	$(MAKE) clean -C simple_arithmetics/
-	$(MAKE) clean -C syscall_tests/
\ No newline at end of file
+	$(MAKE) clean -C simple_arithmetics/
\ No newline at end of file
diff --git a/test/riscv_instructions/syscall_tests/Makefile b/test/syscall_tests/Makefile
similarity index 70%
rename from test/riscv_instructions/syscall_tests/Makefile
rename to test/syscall_tests/Makefile
index e528387..13adddc 100644
--- a/test/riscv_instructions/syscall_tests/Makefile
+++ b/test/syscall_tests/Makefile
@@ -10,7 +10,7 @@ tests: halt.guac prints.guac
 clean:
 	$(RM) halt.o halt prints prints.o 
 
-TOPDIR = ../../..
+TOPDIR = ../..
 include $(TOPDIR)/Makefile.rules
 
 $(PROGRAMS): % : $(USERLIB)/sys.o $(USERLIB)/libnachos.o %.o
\ No newline at end of file
diff --git a/test/syscall_tests/halt b/test/syscall_tests/halt
new file mode 100755
index 0000000..351625f
Binary files /dev/null and b/test/syscall_tests/halt differ
diff --git a/test/riscv_instructions/syscall_tests/halt.c b/test/syscall_tests/halt.c
similarity index 100%
rename from test/riscv_instructions/syscall_tests/halt.c
rename to test/syscall_tests/halt.c
diff --git a/test/syscall_tests/prints b/test/syscall_tests/prints
new file mode 100755
index 0000000..d3545b5
Binary files /dev/null and b/test/syscall_tests/prints differ
diff --git a/test/riscv_instructions/syscall_tests/prints.c b/test/syscall_tests/prints.c
similarity index 100%
rename from test/riscv_instructions/syscall_tests/prints.c
rename to test/syscall_tests/prints.c