diff --git a/.travis.yml b/.travis.yml
index 807c462..b528291 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,15 @@
 language: sh
+
 script: |
     PATH=$PATH:$TRAVIS_BUILD_DIR make test
+
 addons:
   apt:
+    sources:
+    - debian-sid    # Grab shellcheck from the Debian repo (o_O)
     packages:
     - socat
+    - shellcheck
+
+notifications:
+  email: false
diff --git a/Makefile b/Makefile
index 156bedc..a0d4e7a 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,9 @@ install : $(PROGRAM)
 test:
 	make -C tests all
 
+shellcheck:
+	make -C tests shellcheck
+
 readme:
 	@ printf '<!---\nThis README file is generated. Changes will be overwritten.\n-->\n' > README.md
 	@ printf '[![Build Status](https://travis-ci.org/whiteinge/ok.sh.svg?branch=master)](https://travis-ci.org/whiteinge/ok.sh)\n' >> README.md
diff --git a/tests/Makefile b/tests/Makefile
index e743943..d0d26c6 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,4 +1,7 @@
-all: test
+all: test shellcheck
 
 test:
 	./run_tests.sh
+
+shellcheck:
+	shellcheck -e SC2155 ../ok.sh