diff --git a/debian/control b/debian/control
index e80d5fa..ab86337 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Debian Go Packaging Team <pkg-go-maintainers@lists.alioth.debian.org>
 Uploaders: Dmitry Smirnov <onlyjob@debian.org>, Tim Potter <tpot@hpe.com>
 Build-Depends: debhelper (>= 9),
-               dh-golang,
+               dh-golang (>= 1.31),
                golang-go
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-go/packages/golang-bindata.git
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index fcf4e15..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-test-fixture-locations.patch
diff --git a/debian/patches/test-fixture-locations.patch b/debian/patches/test-fixture-locations.patch
deleted file mode 100644
index 209e28d..0000000
--- a/debian/patches/test-fixture-locations.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Description: Modify test fixture paths
- The Debian packging process executes Go tests in a subdirectory
- which is not handled correctly.  The path to each test fixture
- file has been updated to reflect this.
-Author: Tim Potter <tpot@hpe.com>
-Forwarded: no
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: golang-bindata/convert_test.go
-===================================================================
---- golang-bindata.orig/convert_test.go
-+++ golang-bindata/convert_test.go
-@@ -19,7 +19,7 @@ func TestFindFiles(t *testing.T) {
- 	var toc []Asset
- 	var knownFuncs = make(map[string]int)
- 	var visitedPaths = make(map[string]bool)
--	err := findFiles("testdata/dupname", "testdata/dupname", true, &toc, []*regexp.Regexp{}, knownFuncs, visitedPaths)
-+	err := findFiles("../../../../../testdata/dupname", "../../../../../testdata/dupname", true, &toc, []*regexp.Regexp{}, knownFuncs, visitedPaths)
- 	if err != nil {
- 		t.Errorf("expected to be no error: %+v", err)
- 	}
-@@ -34,14 +34,14 @@ func TestFindFilesWithSymlinks(t *testin
- 
- 	var knownFuncs = make(map[string]int)
- 	var visitedPaths = make(map[string]bool)
--	err := findFiles("testdata/symlinkSrc", "testdata/symlinkSrc", true, &tocSrc, []*regexp.Regexp{}, knownFuncs, visitedPaths)
-+	err := findFiles("../../../../../testdata/symlinkSrc", "../../../../../testdata/symlinkSrc", true, &tocSrc, []*regexp.Regexp{}, knownFuncs, visitedPaths)
- 	if err != nil {
- 		t.Errorf("expected to be no error: %+v", err)
- 	}
- 
- 	knownFuncs = make(map[string]int)
- 	visitedPaths = make(map[string]bool)
--	err = findFiles("testdata/symlinkParent", "testdata/symlinkParent", true, &tocTarget, []*regexp.Regexp{}, knownFuncs, visitedPaths)
-+	err = findFiles("../../../../../testdata/symlinkParent", "../../../../../testdata/symlinkParent", true, &tocTarget, []*regexp.Regexp{}, knownFuncs, visitedPaths)
- 	if err != nil {
- 		t.Errorf("expected to be no error: %+v", err)
- 	}
-@@ -64,7 +64,7 @@ func TestFindFilesWithRecursiveSymlinks(
- 
- 	var knownFuncs = make(map[string]int)
- 	var visitedPaths = make(map[string]bool)
--	err := findFiles("testdata/symlinkRecursiveParent", "testdata/symlinkRecursiveParent", true, &toc, []*regexp.Regexp{}, knownFuncs, visitedPaths)
-+	err := findFiles("../../../../../testdata/symlinkRecursiveParent", "../../../../../testdata/symlinkRecursiveParent", true, &toc, []*regexp.Regexp{}, knownFuncs, visitedPaths)
- 	if err != nil {
- 		t.Errorf("expected to be no error: %+v", err)
- 	}
-@@ -79,7 +79,7 @@ func TestFindFilesWithSymlinkedFile(t *t
- 
- 	var knownFuncs = make(map[string]int)
- 	var visitedPaths = make(map[string]bool)
--	err := findFiles("testdata/symlinkFile", "testdata/symlinkFile", true, &toc, []*regexp.Regexp{}, knownFuncs, visitedPaths)
-+	err := findFiles("../../../../../testdata/symlinkFile", "../../../../../testdata/symlinkFile", true, &toc, []*regexp.Regexp{}, knownFuncs, visitedPaths)
- 	if err != nil {
- 		t.Errorf("expected to be no error: %+v", err)
- 	}