diff --git a/Makefile b/Makefile
index a7cd2e46b..40a1b591d 100755
--- a/Makefile
+++ b/Makefile
@@ -3,15 +3,20 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 PROJECT		:= go.mozilla.org/userplex
+GO		:= GO111MODULE=on GOPROXY=https://proxy.golang.org go
 
 all: test vet install
 
 dev: lint cyclo all
 
 install:
-	go install $(PROJECT)
+	$(GO) install $(PROJECT)
 
-test:
+vendor:
+	$(GO) mod tidy
+	$(GO) mod vendor
+
+test: vendor
 	./test.sh
 
 lint:
@@ -19,7 +24,7 @@ lint:
 	golint modules/...
 
 vet:
-	go vet $(PROJECT)
+	$(GO) vet $(PROJECT)
 
 cyclo:
 	gocyclo -over 15 *.go modules/
diff --git a/go.sum b/go.sum
index 0513f0f9b..161878c68 100644
--- a/go.sum
+++ b/go.sum
@@ -96,7 +96,6 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod h1:g2644b03hfBX9Ov0ZBDgXXens4rxSxmqFBbhvKv2yVA=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/goware/prefixer v0.0.0-20160118172347-395022866408 h1:Y9iQJfEqnN3/Nce9cOegemcy/9Ai5k3huT6E80F3zaw=
@@ -208,9 +207,6 @@ github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 go.mozilla.org/gopgagent v0.0.0-20170926210634-4d7ea76ff71a h1:N7VD+PwpJME2ZfQT8+ejxwA4Ow10IkGbU0MGf94ll8k=
 go.mozilla.org/gopgagent v0.0.0-20170926210634-4d7ea76ff71a/go.mod h1:YDKUvO0b//78PaaEro6CAPH6NqohCmL2Cwju5XI2HoE=
-go.mozilla.org/mozldap v0.0.0-20160924171832-b72e7f45c7f9/go.mod h1:NgU8IAlCZQrJsiUAkqwqycKx6MW1IMU0iXQ8FY8fKrg=
-go.mozilla.org/person-api v0.0.0-20191120210847-5e8f6374ee7e h1:8BhgZxXe2v7TZaGmjtrVu4GzrPcmwTR1GIW+W7gvHaI=
-go.mozilla.org/person-api v0.0.0-20191120210847-5e8f6374ee7e/go.mod h1:w6D2G0XDLxCfr8DmfCkbYwwhhcVRdFJ2Gpwxe/rJt8c=
 go.mozilla.org/person-api v0.0.0-20191125182003-e07ecb512bfe h1:SY8AtlmPXNc/tUapjxMqAHxRoMlTp7pLZvwzpdFOv3c=
 go.mozilla.org/person-api v0.0.0-20191125182003-e07ecb512bfe/go.mod h1:w6D2G0XDLxCfr8DmfCkbYwwhhcVRdFJ2Gpwxe/rJt8c=
 go.mozilla.org/sops/v3 v3.5.0 h1:GpO9JRZhk6Kc+FVw5Q0vmnvDM6k956ZRh5tbG98T4XI=
@@ -338,7 +334,6 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/ini.v1 v1.44.0 h1:YRJzTUp0kSYWUVFF5XAbDFfyiqwsl0Vb9R8TVP5eRi0=
 gopkg.in/ini.v1 v1.44.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ldap.v2 v2.5.1/go.mod h1:oI0cpe/D7HRtBQl8aTg+ZmzFUAvu4lsv3eLXMLGFxWk=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=