diff --git a/Makefile b/Makefile
index 2521518..607ac59 100644
--- a/Makefile
+++ b/Makefile
@@ -1,29 +1,8 @@
-targets = tock raintest
+targets = tock tocktest
 
 all: $(targets)
 
-sources = \
-	AST.hs \
-	CompState.hs \
-	Errors.hs \
-	EvalConstants.hs \
-	EvalLiterals.hs \
-	GenerateC.hs \
-	GenerateCPPCSP.hs \
-	Indentation.hs \
-	Intrinsics.hs \
-	Main.hs \
-	Metadata.hs \
-	Parse.hs \
-	Pass.hs \
-	PrettyShow.hs \
-	SimplifyExprs.hs \
-	SimplifyProcs.hs \
-	SimplifyTypes.hs \
-	TLP.hs \
-	Types.hs \
-	Unnest.hs \
-	Utils.hs
+sources = $(wildcard *.hs)
 
 # profile_opts = -prof -auto-all
 ghc_opts = \
@@ -35,8 +14,8 @@ ghc_opts = \
 tock: $(sources)
 	ghc $(ghc_opts) -o tock --make Main
 
-raintest: $(sources)
-	ghc $(ghc_opts) -o raintest -main-is RainParseTest --make RainParseTest
+tocktest: $(sources)
+	ghc $(ghc_opts) -o tocktest -main-is TestMain --make TestMain
 
 CFLAGS = \
 	-O2 \
@@ -62,20 +41,10 @@ all-cgtests: $(cgtests_targets)
 clean-cgtests:
 	rm -f cgtests/cgtest?? cgtests/*.tock.*
 
-#I recommend that in a test file, you should always export only the "tests" function, and use
-#the compilation option "-fwarn-unused-binds" in order to catch tests you've defined but not run:
-
-test: $(sources) UsageCheckTest.hs TestUtil.hs RainParseTest.hs TestMain.hs
-	ghc -fglasgow-exts -fallow-undecidable-instances -fwarn-unused-binds $(profile_opts) -o tocktest -main-is TestMain --make TestMain
-
 haddock:
 	@mkdir -p doc
 	haddock -o doc --html $(sources)
 
-raintest: $(sources) RainParse.hs RainParseTest.hs Makefile
-	ghc -fglasgow-exts -fallow-undecidable-instances -fwarn-unused-binds $(profile_opts) -o raintest -main-is RainParseTest --make RainParseTest
-
-
 clean:
 	rm -f $(targets) *.o *.hi