diff --git a/.travis.yml b/.travis.yml
index 1b1ce39b6..a876448d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,12 @@ matrix:
       script:
         - 
           go get github.com/alecthomas/gometalinter && gometalinter --install && gometalinter ./... --deadline=10m --exclude=client/internal/client_helper.go
+    - os: linux
+      env: 
+        - todos
+      install: true # Skip installing go packages
+      script:
+          - ./scripts/check-todo.sh
     - os: linux
       env:
         - coverage
diff --git a/scripts/check-todo.sh b/scripts/check-todo.sh
new file mode 100755
index 000000000..5345882c5
--- /dev/null
+++ b/scripts/check-todo.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Continuous integration script to check that TODOs are in the correct format
+OUTPUT="$(grep -PrinH '(?<!context\.)todo(?!\(#{0,1}\d+\))' --include \*.go *)";
+if [ "$OUTPUT" != "" ] ;
+then 
+    echo "Invalid TODOs found. Failing." >&2;
+    echo "$OUTPUT" >&2;
+    exit 1;
+fi