diff --git a/test/Makefile b/test/Makefile
index ad2c039..c017d08 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,9 +1,15 @@
 TOPDIR=.
 include $(TOPDIR)/Makefile.config
 
+
+all: dumps user_lib tests
 # 
 # Main targets
 #
+
+build: user_lib
+	$(MAKE) build -C riscv_instructions/
+
 dumps:
 	$(MAKE) dumps -C riscv_instructions/
 	mkdir -p ${TOPDIR}/target/dumps/
@@ -18,4 +24,7 @@ tests: user_lib
 	find . -name '*.guac' -exec mv {} ${TOPDIR}/target/guac/ \;
 
 clean:
-	rm -rf $(TOPDIR)/target
\ No newline at end of file
+	$(MAKE) clean -C userlib/
+	$(MAKE) clean -C riscv_instructions/
+	$(RM) -rf $(TOPDIR)/target
+	
\ No newline at end of file
diff --git a/test/riscv_instructions/Makefile b/test/riscv_instructions/Makefile
index 22a1303..cabd3bb 100644
--- a/test/riscv_instructions/Makefile
+++ b/test/riscv_instructions/Makefile
@@ -1,3 +1,8 @@
+build:
+	make build -C boolean_logic/
+# make build -C jump_instructions/
+# make build -C simple_arithmetics/
+
 dumps:
 	make dumps -C boolean_logic/
 	make dumps -C jump_instructions/
@@ -6,4 +11,9 @@ dumps:
 tests:
 	make tests -C boolean_logic/
 	make tests -C jump_instructions/
-	make tests -C simple_arithmetics/
\ No newline at end of file
+	make tests -C simple_arithmetics/
+
+clean:
+	$(MAKE) clean -C boolean_logic/
+	$(MAKE) clean -C jump_instructions/
+	$(MAKE) clean -C simple_arithmetics/
\ No newline at end of file
diff --git a/test/riscv_instructions/boolean_logic/Makefile b/test/riscv_instructions/boolean_logic/Makefile
index 5f738e9..b1f6312 100644
--- a/test/riscv_instructions/boolean_logic/Makefile
+++ b/test/riscv_instructions/boolean_logic/Makefile
@@ -1,6 +1,8 @@
 TOPDIR = ../..
 include $(TOPDIR)/Makefile.tests
 
+build: comparisons if switch
+
 dumps: comparisons.dump if.dump switch.dump
 
 tests: comparisons.guac if.guac switch.guac
diff --git a/test/userlib/Makefile b/test/userlib/Makefile
index 903f3b5..6a5c70f 100644
--- a/test/userlib/Makefile
+++ b/test/userlib/Makefile
@@ -1,4 +1,7 @@
 TOPDIR = ../
 include $(TOPDIR)/Makefile.tests
 
-default: sys.o libnachos.o
\ No newline at end of file
+default: sys.o libnachos.o
+
+clean:
+	$(RM) libnachos.o sys.o
\ No newline at end of file