diff --git a/Makefile b/Makefile
index 5b060ef..6647956 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,14 @@
 FILE = netcalc
 
-all: $(FILE)
+all: $(FILE) tests
 
 .PHONY: clean
 clean: 
 	rm netcalc
 
-$(FILE): netcalc.c
+$(FILE): $(FILE).c
 	gcc $^ -o $@
+
+tests:
+	./netcalc -c < test/cases > test/results
+	diff test/results test/expected
diff --git a/tests/cases b/test/cases
similarity index 100%
rename from tests/cases
rename to test/cases
diff --git a/tests/expected b/test/expected
similarity index 100%
rename from tests/expected
rename to test/expected
diff --git a/tests/tests.sh b/tests/tests.sh
deleted file mode 100755
index 5d49697..0000000
--- a/tests/tests.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-cat cases | ../netcalc -c > results
-diff expected results