diff -Nru golang-1.11-1.11.5+ppa/debian/changelog golang-1.11-1.11.5+ppa/debian/changelog
--- golang-1.11-1.11.5+ppa/debian/changelog	2019-02-11 08:48:01.000000000 +0000
+++ golang-1.11-1.11.5+ppa/debian/changelog	2019-02-11 10:40:21.000000000 +0000
@@ -1,10 +1,10 @@
-golang-1.11 (1.11.5+ppa-0ubuntu1~ppa0~ubuntu18.10.1) cosmic; urgency=low
+golang-1.11 (1.11.5+ppa-0ubuntu1~ppa1~ubuntu18.10.1) cosmic; urgency=low
 
   * Auto build.
 
- -- Michael Hudson-Doyle <mwhudsonlp@fastmail.fm>  Mon, 11 Feb 2019 08:48:01 +0000
+ -- Michael Hudson-Doyle <mwhudsonlp@fastmail.fm>  Mon, 11 Feb 2019 10:40:21 +0000
 
-golang-1.11 (1.11.5+ppa-0ubuntu1~ppa0) UNRELEASED; urgency=medium
+golang-1.11 (1.11.5+ppa-0ubuntu1~ppa1) UNRELEASED; urgency=medium
 
   * Version for ppa:gophers/archive.
   * Revert upstream sources to 1.11.5
@@ -14,6 +14,8 @@
   * build with go 1.6 or better
   * skip a test that fails because the recipe build process strips .a
     files
+  * Stop dh_strip_nondeterminism from looking at testdata directories.
+  * Remove GOCACHE files after running tests.
 
  -- Michael Hudson-Doyle <mwhudson@debian.org>  Mon, 11 Feb 2019 14:43:37 +1300
 
diff -Nru golang-1.11-1.11.5+ppa/debian/git-build-recipe.manifest golang-1.11-1.11.5+ppa/debian/git-build-recipe.manifest
--- golang-1.11-1.11.5+ppa/debian/git-build-recipe.manifest	2019-02-11 08:48:01.000000000 +0000
+++ golang-1.11-1.11.5+ppa/debian/git-build-recipe.manifest	2019-02-11 10:40:21.000000000 +0000
@@ -1,2 +1,2 @@
 # git-build-recipe format 0.4 deb-version {debversion}
-lp:~mwhudson/+git/golang git-commit:ef6c7e5eb461886f4945fa1eff59e1301067dee7
+lp:~mwhudson/+git/golang git-commit:7ecdb4606fb17c56ae030b5ed4ece570a9905879
diff -Nru golang-1.11-1.11.5+ppa/debian/golang-X.Y-go.install golang-1.11-1.11.5+ppa/debian/golang-X.Y-go.install
--- golang-1.11-1.11.5+ppa/debian/golang-X.Y-go.install	2019-02-11 08:47:59.000000000 +0000
+++ golang-1.11-1.11.5+ppa/debian/golang-X.Y-go.install	2019-02-11 10:40:19.000000000 +0000
@@ -3,5 +3,4 @@
 bin/gofmt /usr/lib/go-X.Y/bin/
 pkg/*_* /usr/lib/go-X.Y/pkg/
 pkg/include /usr/share/go-X.Y/pkg/
-pkg/obj /usr/lib/go-X.Y/pkg/
 pkg/tool /usr/lib/go-X.Y/pkg/
diff -Nru golang-1.11-1.11.5+ppa/debian/rules golang-1.11-1.11.5+ppa/debian/rules
--- golang-1.11-1.11.5+ppa/debian/rules	2019-02-11 08:47:59.000000000 +0000
+++ golang-1.11-1.11.5+ppa/debian/rules	2019-02-11 10:40:19.000000000 +0000
@@ -6,7 +6,6 @@
 
 export GOROOT := $(CURDIR)
 export GOROOT_FINAL := /usr/lib/go-$(GOVER)
-export GOCACHE := off
 
 export PATH := /usr/lib/go-1.6/bin:$(PATH)
 
@@ -77,6 +76,8 @@
 else
 	# skip the tests on platforms where they fail
 endif
+	# Remove GOCACHE files
+	rm -rf pkg/obj
 
 override_dh_compress-indep:
 	dh_compress -Xusr/share/doc/golang-doc/html -Xusr/share/doc/golang-doc/godoc
@@ -100,6 +101,9 @@
 override_dh_strip:
 	dh_strip -Xtestdata
 
+override_dh_strip_nondeterminism:
+	dh_strip_nondeterminism -Xtestdata
+
 override_dh_shlibdeps:
 	dh_shlibdeps -Xtestdata -Xtest