diff --git a/.travis.yml b/.travis.yml
index 44e78ee04..e725aa0ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,8 @@ script:
   - cargo test --verbose --all
   - cargo test --verbose --release --all
   - cargo fmt --all -- --check
+  # No clippy until later...
+  #- cargo clippy
 rust:
   - stable
   - beta
@@ -22,3 +24,4 @@ matrix:
   fast_finish: true
 install:
   - rustup component add rustfmt
+  - rustup component add clippy
diff --git a/Dockerfile b/Dockerfile
index 063ece3cd..6691efa97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,3 +15,7 @@ RUN git clone https://github.com/google/protobuf.git && \
 
 
 RUN mkdir /cargocache && chmod -R ugo+rwX /cargocache
+
+ENV CARGO_HOME /cargocache
+
+RUN rustup component add rustfmt clippy
diff --git a/Jenkinsfile b/Jenkinsfile
index 1a3afad87..d12189941 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,6 +12,13 @@ pipeline {
 				sh 'cargo build --verbose --all --release'
 			}
 		}
+        stage('Check') {
+            steps {
+                sh 'cargo fmt --all -- --check'
+                // No clippy until later...
+                //sh 'cargo clippy'
+            }
+        }
 		stage('Test') {
 			steps {
 				sh 'cargo test --verbose --all'