diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4514626b7..aec8be180 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -179,6 +179,15 @@ jobs:
           name: Check spelling
           command: ~/.local/bin/codespell -S "*.enc,.git" -I ./scripts/codespell_whitelist.txt
 
+  test_trailing_whitespace:
+    docker:
+      - image: buildpack-deps:artful
+    steps:
+      - checkout
+      - run:
+          name: Check for trailing whitespace
+          command: ./scripts/detect_trailing_whitespace.sh
+
   test_buglist:
       docker:
         - image: circleci/node
@@ -263,6 +272,7 @@ workflows:
   build_all:
     jobs:
       - test_check_spelling: *build_on_tags
+      - test_trailing_whitespace: *build_on_tags
       - test_buglist: *build_on_tags
       - build_emscripten: *build_on_tags
       - test_emscripten_solcjs:
diff --git a/scripts/detect_trailing_whitespace.sh b/scripts/detect_trailing_whitespace.sh
new file mode 100755
index 000000000..78e695848
--- /dev/null
+++ b/scripts/detect_trailing_whitespace.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+REPO_ROOT="$(dirname "$0")"/..
+
+(
+cd $REPO_ROOT
+WHITESPACE=$(git grep -n -I -E "^.*[[:space:]]+$" | grep -v "test/libsolidity/ASTJSON\|test/compilationTests/zeppelin/LICENSE")
+
+if [[ "$WHITESPACE" != "" ]]
+then
+	echo "Error: Trailing whitespace found:" >&2
+	echo "\"$WHITESPACE\"" >&2
+	exit 1
+else
+	exit 0
+fi
+)