diff --git a/.travis.yml b/.travis.yml
index 505baa95b..61c737f44 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ install:
 script:
 - make vendor-status
 - make test
+- make e2etest
 - make vet
 - GOOS=windows go build
 branches:
diff --git a/Makefile b/Makefile
index e5ca1dfba..07897daac 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,12 @@ testacc: fmtcheck generate
 	fi
 	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m
 
+# e2etest runs the end-to-end tests against a generated Terraform binary
+# The TF_ACC here allows network access, but does not require any special
+# credentials since the e2etests use local-only providers such as "null".
+e2etest: generate
+	TF_ACC=1 go test -v ./command/e2etest
+
 test-compile: fmtcheck generate
 	@if [ "$(TEST)" = "./..." ]; then \
 		echo "ERROR: Set TEST to a specific package. For example,"; \
@@ -96,4 +102,4 @@ vendor-status:
 # under parallel conditions.
 .NOTPARALLEL:
 
-.PHONY: bin cover default dev fmt fmtcheck generate plugin-dev quickdev test-compile test testacc testrace tools vendor-status vet
+.PHONY: bin cover default dev e2etest fmt fmtcheck generate plugin-dev quickdev test-compile test testacc testrace tools vendor-status vet