diff --git a/.travis.yml b/.travis.yml
index 4b2166ff..9b65c11f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,8 @@ services:
 - docker
 language: go
 go:
-  - "1.11.x"
+  - stable
+  - tip
 env:
   - GO111MODULE=on GOFLAGS=-mod=vendor
 
@@ -17,9 +18,8 @@ install:
 
 script:
 - make test
-- bash dns/acceptance.sh
+- bash internal/provider/acceptance.sh
 - make vet
-- make website-test
 
 branches:
   only:
diff --git a/GNUmakefile b/GNUmakefile
index 73759d42..abe622db 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,6 +1,5 @@
 TEST?=$$(go list ./... |grep -v 'vendor')
 GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
-WEBSITE_REPO=github.com/hashicorp/terraform-website
 PKG_NAME=dns
 
 default: build
@@ -45,19 +44,4 @@ test-compile:
 	fi
 	go test -c $(TEST) $(TESTARGS)
 
-website:
-ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
-	echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..."
-	git clone https://$(WEBSITE_REPO) $(GOPATH)/src/$(WEBSITE_REPO)
-endif
-	@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)
-
-website-test:
-ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
-	echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..."
-	git clone https://$(WEBSITE_REPO) $(GOPATH)/src/$(WEBSITE_REPO)
-endif
-	@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider-test PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)
-
-.PHONY: build test testacc vet fmt fmtcheck errcheck vendor-status test-compile website website-test
-
+.PHONY: build test testacc vet fmt fmtcheck errcheck vendor-status test-compile