diff --git a/Makefile b/Makefile
index ba9480ff..6760bcfa 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,10 @@ all: format build test
 
 test:
 	@echo ">> running tests"
-	@$(GO) test -short $(pkgs)
+	@$(GO) test -short -race $(pkgs)
+
+test-integration: test
+	@./build/integration.sh
 
 format:
 	@echo ">> formatting code"
diff --git a/build/integration.sh b/build/integration.sh
new file mode 100755
index 00000000..2cef0669
--- /dev/null
+++ b/build/integration.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+# Copyright 2015 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+
+echo ">> starting cAdvisor locally"
+sudo ./cadvisor &
+echo ">> running integration tests against local cAdvisor"
+godep go test github.com/google/cadvisor/integration/tests/... --vmodule=*=2
+if [ $? -ne 0 ]
+then
+    echo "Integration tests failed"
+fi
+echo ">> stopping cAdvisor"
+sudo pkill -9 cadvisor
+