diff --git a/.travis.yml b/.travis.yml
index 3a9abe355..bd22a437f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ env:
   matrix:
     - GOARCH=386
     - GOARCH=amd64
+    - GOARCH=amd64 TESTFLAGS="-tags enterprise"
 install:
   - make install-dep install-statik vendor generate-statik
 script:
diff --git a/Makefile b/Makefile
index 94081cb52..76d3199d1 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,10 @@ vendor: Gopkg.toml
 test: vendor
 	go test ./... $(TESTFLAGS)
 
+# Run EE test suite
+test-ee:
+	make test TESTFLAGS="-tags enterprise"
+
 # Run test suite with coverage enabled
 cover: vendor
 	mkdir -p build