diff --git a/Makefile b/Makefile
index 99a874787e2..76ebf48b413 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 all: gnoland gnokey goscan logos
 
-.PHONY: logos goscan gnoland gnokey gnofaucet logos reset test test1 test2 testrealm testrealm1 testrealm2 testpackages testpkgs
+.PHONY: logos goscan gnoland gnokey gnofaucet logos reset
 
 reset:
 	rm -rf testdir
@@ -42,45 +42,34 @@ logos:
 clean:
 	rm -rf build
 
-test:
-	echo "Running tests"
-	go test
-	go test tests/*.go -v -test.short --timeout 20m
+# Test suite
+.PHONY: test test.go test.gno test.files1 test.files2 test.realm test.packages
+test: test.gno test.go
+	@echo "Full test suite finished."
 
-test1:
-	echo "Running tests"
-	go test
-	go test tests/*.go -v -test.short -run "TestFiles1"
+test.gno: test.files1 test.files2 test.realm test.packages
+	go test tests/*.go -v -run "TestFileStr"
+	go test tests/*.go -v -run "TestSelectors"
 
-test2:
-	echo "Running tests"
-	go test
-	go test tests/*.go -v -test.short -run "TestFiles2"
+test.go:
+	go test . -v
+	# -p 1 shows test failures as they come
+	# maybe another way to do this?
+	go test ./pkgs/... -v -p 1 -count 1
 
-testrealm:
-	echo "Running tests"
-	go test
-	go test tests/*.go -v -run "TestFiles/^zrealm"
+test.files1:
+	go test tests/*.go -v -test.short -run "TestFiles1/" --timeout 20m
 
-testrealm1:
-	echo "Running tests"
-	go test
-	go test tests/*.go -v -run "TestFiles1/^zrealm"
+test.files2:
+	go test tests/*.go -v -test.short -run "TestFiles2/" --timeout 20m
 
-testrealm2:
-	echo "Running tests"
-	go test
-	go test tests/*.go -v -run "TestFiles2/^zrealm"
+test.realm:
+	go test tests/*.go -v -run "TestFiles/^zrealm"
 
-testpackages:
-	echo "Running tests"
+test.packages:
 	go test tests/*.go -v -run "TestPackages"
 
-testpkgs:
-	# -p 1 shows test failures as they come
-	# maybe another way to do this?
-	go test ./pkgs/... -p 1 -count 1
-
+# Code gen
 stringer:
 	stringer -type=Op