diff --git a/tests/.gitignore b/tests/.gitignore
index 87996df..8144904 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,2 +1 @@
-kahan
-crc
+*_test
diff --git a/tests/Makefile b/tests/Makefile
index 85193d0..c935b00 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,14 +1,15 @@
 
-CXXFLAGS = -I.. -std=c++11 -W -Wall -O3 -march=native -ffast-math
+CXXFLAGS = -I.. -std=c++17 -W -Wall -Ofast -fno-exceptions -fno-rtti -march=native
 CXX = clang++ -stdlib=libc++
 #CXX = g++
 
 .PHONY: clean test
 
-test: kahan crc
-	./kahan
-	./crc
+tests := $(basename $(wildcard *_test.*))
+
+test: $(tests)
+	$(patsubst %,./%;,$(tests))
 
 clean:
-	rm -f kahan crc
+	rm -f *_test
 
diff --git a/tests/crc.cc b/tests/crc_test.cc
similarity index 100%
rename from tests/crc.cc
rename to tests/crc_test.cc
diff --git a/tests/kahan.cc b/tests/kahan_test.cc
similarity index 100%
rename from tests/kahan.cc
rename to tests/kahan_test.cc