diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ff9204..a59f1d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: scorpil/rust:stable
+image: scorpil/rust:nightly
 
 stages:
   - test
@@ -10,6 +10,9 @@ cargo:test:
 
 rustfmt:
   stage: test
+  before_script:
+    - cargo install rustfmt
+    - export PATH="/root/.cargo/bin:$PATH"
   script:
     - ci/run-rustfmt.sh
 
diff --git a/.travis.yml b/.travis.yml
index 3d9c78c..f67fe0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,4 +2,6 @@ language: rust
 rust:
   - nightly
 script:
-  - true
+  - cargo install rustfmt
+  - ci/run-rustfmt.sh
+  - ci/run-cargo-test.sh
diff --git a/ci/run-rustfmt.sh b/ci/run-rustfmt.sh
index 37403d1..a3240e4 100755
--- a/ci/run-rustfmt.sh
+++ b/ci/run-rustfmt.sh
@@ -4,10 +4,7 @@ ERROR=0
 
 while IFS= read -r -d '' f; do
   echo "${f}"
-
-  if  [ "$(rustfmt --write-mode=diff "$f")" != $'' ]  ; then
-      ERROR=1
-  fi
+  rustfmt --write-mode=diff "$f" || ERROR=1
 done < <(find . -type f -name '*.rs' -print0)
 
 exit ${ERROR}