diff --git a/util/int/Makefile b/util/int/Makefile
index f1e3ab52..31321aa8 100644
--- a/util/int/Makefile
+++ b/util/int/Makefile
@@ -39,15 +39,15 @@ HDR =	alloc.h fra.h global.h linfil.h log.h mem.h memdirect.h monstruct.h \
 
 
 # Main entries
-test:	$(INT)
+test:	$(INT) test/awa.em22 test/awa.em24 test/awa.em44
 	@rm -f int.mess
-	- time $(INT) test22/awa.em <test22/awa.inp
+	-echo 3 5 7 2 -1 | time $(INT) test/awa.em22
 	cat int.mess
 	@rm -f int.mess
-	-echo 3 5 7 2 -1 | time $(INT) test24/awa.em
+	-echo 3 5 7 2 -1 | time $(INT) test/awa.em24
 	cat int.mess
 	@rm -f int.mess
-	-echo 3 5 7 2 -1 | time $(INT) test44/awa.em
+	-echo 3 5 7 2 -1 | time $(INT) test/awa.em44
 	cat int.mess
 
 $(INT):	$(OBJ) Makefile
@@ -71,6 +71,15 @@ switch/DoCases:	$(IP_SPEC)
 switch/PrCases:	$(IP_SPEC)
 	(cd switch; make IP_SPEC=$(IP_SPEC) PrCases)
 
+test/awa.em22:
+	(cd test; make awa.em22)
+
+test/awa.em24:
+	(cd test; make awa.em24)
+
+test/awa.em44:
+	(cd test; make awa.em44)
+
 
 # Auxiliary entries
 lint:
@@ -94,6 +103,7 @@ clean:
 		trap_msg warn_msg warn.h tags print \
 		$(OBJ)
 	(cd switch; make clean)
+	(cd switch; make clean)
 
 bare:	clean
 	/bin/rm -f $(INT)
@@ -120,7 +130,7 @@ do_ptrar.o: fra.h global.h log.h logging.h mem.h segcheck.h text.h trap.h warn.h
 do_sets.o: fra.h global.h log.h logging.h mem.h text.h trap.h
 do_store.o: fra.h global.h log.h logging.h mem.h text.h trap.h warn.h
 do_unsar.o: fra.h global.h log.h logging.h mem.h text.h trap.h warn.h
-dump.o: global.h linfil.h log.h logging.h mem.h memdirect.h proctab.h rsb.h shadow.h text.h
+dump.o: fra.h global.h linfil.h log.h logging.h mem.h memdirect.h proctab.h rsb.h shadow.h text.h
 fra.o: alloc.h fra.h global.h logging.h mem.h shadow.h
 global.o: global.h
 init.o: alloc.h global.h log.h logging.h mem.h read.h shadow.h trap.h warn.h
diff --git a/util/int/READ_ME b/util/int/READ_ME
index 20f1db16..a0511961 100644
--- a/util/int/READ_ME
+++ b/util/int/READ_ME
@@ -25,6 +25,11 @@ There are a small number of compile-time flags, each in a separate file:
 	nofloat.h	- define if the C compiler used has no floating point
 
 
+There are two subdirectories:
+	switch		- generates opcode-analysing switches
+	test		- contains testprograms
+
+
 Installation note:
 The file do_fpar.c (do floating point arithmetic) contains a macro  MAXDOUBLE
 which defines the largest possible double on the present machine. It is set to