diff --git a/dos33fs-utils/Makefile b/dos33fs-utils/Makefile
index 3f60b0ee..370fc7d5 100644
--- a/dos33fs-utils/Makefile
+++ b/dos33fs-utils/Makefile
@@ -40,3 +40,4 @@ install:
 
 clean:		
 		rm -f *~ *.o dos33 mkdos33fs make_b dos33_text2ascii char2hex
+		cd tests && make clean
diff --git a/tests/LL_6502 b/dos33fs-utils/tests/LL_6502
similarity index 100%
rename from tests/LL_6502
rename to dos33fs-utils/tests/LL_6502
diff --git a/tests/Makefile b/dos33fs-utils/tests/Makefile
similarity index 66%
rename from tests/Makefile
rename to dos33fs-utils/tests/Makefile
index 2c600686..363151b7 100644
--- a/tests/Makefile
+++ b/dos33fs-utils/tests/Makefile
@@ -1,5 +1,6 @@
-all:	
+all:
+	./test.sh
 
 clean:	
 	rm -f *.out *~ test.dsk
-	
+
diff --git a/tests/SINCOS b/dos33fs-utils/tests/SINCOS
similarity index 100%
rename from tests/SINCOS
rename to dos33fs-utils/tests/SINCOS
diff --git a/tests/TB_6502 b/dos33fs-utils/tests/TB_6502
similarity index 100%
rename from tests/TB_6502
rename to dos33fs-utils/tests/TB_6502
diff --git a/tests/TODO b/dos33fs-utils/tests/TODO
similarity index 100%
rename from tests/TODO
rename to dos33fs-utils/tests/TODO
diff --git a/tests/YOU.LOGO b/dos33fs-utils/tests/YOU.LOGO
similarity index 100%
rename from tests/YOU.LOGO
rename to dos33fs-utils/tests/YOU.LOGO
diff --git a/tests/empty.dsk b/dos33fs-utils/tests/empty.dsk
similarity index 100%
rename from tests/empty.dsk
rename to dos33fs-utils/tests/empty.dsk
diff --git a/tests/run_all_tests.sh b/dos33fs-utils/tests/run_all_tests.sh
similarity index 100%
rename from tests/run_all_tests.sh
rename to dos33fs-utils/tests/run_all_tests.sh
diff --git a/tests/test.int b/dos33fs-utils/tests/test.int
similarity index 100%
rename from tests/test.int
rename to dos33fs-utils/tests/test.int
diff --git a/tests/test.sh b/dos33fs-utils/tests/test.sh
similarity index 100%
rename from tests/test.sh
rename to dos33fs-utils/tests/test.sh
diff --git a/tests/test_delete.sh b/dos33fs-utils/tests/test_delete.sh
similarity index 100%
rename from tests/test_delete.sh
rename to dos33fs-utils/tests/test_delete.sh
diff --git a/tests/test_large_files.sh b/dos33fs-utils/tests/test_large_files.sh
similarity index 100%
rename from tests/test_large_files.sh
rename to dos33fs-utils/tests/test_large_files.sh
diff --git a/tests/test_lock.sh b/dos33fs-utils/tests/test_lock.sh
similarity index 100%
rename from tests/test_lock.sh
rename to dos33fs-utils/tests/test_lock.sh
diff --git a/tests/test_lots_of_files.sh b/dos33fs-utils/tests/test_lots_of_files.sh
similarity index 100%
rename from tests/test_lots_of_files.sh
rename to dos33fs-utils/tests/test_lots_of_files.sh
diff --git a/tests/test_odd_filenames.sh b/dos33fs-utils/tests/test_odd_filenames.sh
similarity index 100%
rename from tests/test_odd_filenames.sh
rename to dos33fs-utils/tests/test_odd_filenames.sh
diff --git a/tests/test_rename.sh b/dos33fs-utils/tests/test_rename.sh
similarity index 100%
rename from tests/test_rename.sh
rename to dos33fs-utils/tests/test_rename.sh
diff --git a/tests/test_undelete.sh b/dos33fs-utils/tests/test_undelete.sh
similarity index 100%
rename from tests/test_undelete.sh
rename to dos33fs-utils/tests/test_undelete.sh
diff --git a/tests/test_undelete2.sh b/dos33fs-utils/tests/test_undelete2.sh
similarity index 100%
rename from tests/test_undelete2.sh
rename to dos33fs-utils/tests/test_undelete2.sh