diff --git a/docker.changes b/docker.changes
index 4133c2c..09e98e2 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec  4 12:22:29 UTC 2017 - asarai@suse.com
+
+- Fix up the ordering of tests in docker.spec. This is to keep things easier to
+  backport into the SLE package.
+
 -------------------------------------------------------------------
 Thu Nov 30 10:15:20 UTC 2017 - asarai@suse.com
 
diff --git a/docker.spec b/docker.spec
index 0f9e0d6..40e59f4 100644
--- a/docker.spec
+++ b/docker.spec
@@ -167,7 +167,6 @@ Requires:       apparmor-parser
 Requires:       bash-completion
 Requires:       device-mapper-devel >= 1.2.68
 Requires:       glibc-devel-static
-# Make sure we require go 1.7
 Requires:       libapparmor-devel
 Requires:       libbtrfs-devel >= 3.8
 Requires:       procps
@@ -285,33 +284,35 @@ PKG_LIST=$(go list -e \
 		| grep    'github.com/docker/docker' \
 		| grep -Ev 'vendor/(.+/)?github.com/docker/docker' \
 		| grep -v 'github.com/docker/docker/vendor' \
-		| grep -v 'github.com/docker/docker/integration-cli' \
-		| grep -v 'github.com/docker/docker/pkg/archive$' \
-		| grep -v 'github.com/docker/docker/pkg/chrootarchive$' \
-		| grep -v 'github.com/docker/docker/pkg/gitutils$' \
-		| grep -v 'github.com/docker/docker/pkg/idtools$' \
-		| grep -v 'github.com/docker/docker/pkg/jsonlog$' \
-		| grep -v 'github.com/docker/docker/pkg/mount$' \
-		| grep -v 'github.com/docker/docker/pkg/sysinfo$' \
-		| grep -v 'github.com/docker/docker/registry$' \
-		| grep -v 'github.com/docker/docker/volume/local$' \
 		| grep -v 'github.com/docker/docker/builder$' \
-		| grep -v 'github.com/docker/docker/builder/remotecontext' \
 		| grep -v 'github.com/docker/docker/builder/dockerfile$' \
 		| grep -v 'github.com/docker/docker/builder/dockerfile/parser$' \
+		| grep -v 'github.com/docker/docker/builder/remotecontext' \
+		| grep -v 'github.com/docker/docker/cmd/dockerd$' \
 		| grep -v 'github.com/docker/docker/daemon$' \
 		| grep -v 'github.com/docker/docker/daemon/graphdriver' \
-		| grep -v 'github.com/docker/docker/cmd/dockerd$' \
-		| grep -v 'github.com/docker/docker/pkg/integration$' \
-		| grep -v 'github.com/docker/docker/pkg/testutil' \
+		| grep -Pv 'github.com/docker/docker/daemon/logger(?!/gelf)' \
+		| grep -v 'github.com/docker/docker/integration-cli' \
+		| grep -v 'github.com/docker/docker/man$' \
+		| grep -v 'github.com/docker/docker/pkg/archive$' \
+		| grep -v 'github.com/docker/docker/pkg/chrootarchive$' \
 %if 0%{?sle_version} == 120000
 		| grep -v 'github.com/docker/docker/pkg/devicemapper$' \
 %endif
+		| grep -v 'github.com/docker/docker/pkg/gitutils$' \
+		| grep -v 'github.com/docker/docker/pkg/idtools$' \
+		| grep -v 'github.com/docker/docker/pkg/integration$' \
+		| grep -v 'github.com/docker/docker/pkg/jsonlog$' \
+		| grep -v 'github.com/docker/docker/pkg/mount$' \
+		| grep -v 'github.com/docker/docker/pkg/sysinfo$' \
+		| grep -v 'github.com/docker/docker/pkg/testutil' \
 %if ! 0%{?with_libseccomp}
 		| grep -v 'github.com/docker/docker/profiles/seccomp$' \
 %endif
+		| grep -v 'github.com/docker/docker/registry$' \
+		| grep -v 'github.com/docker/docker/volume/local$' \
 		)
-
+# PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER!
 rm ./pkg/system/rm_test.go
 
 go test -buildmode=pie -cover -ldflags -w -tags "$DOCKER_BUILDTAGS" -a -test.timeout=10m $PKG_LIST
@@ -326,6 +327,7 @@ PKG_LIST=$(go list ./... \
 		| grep -v 'github.com/docker/cli/cli/command/image' \
 		| grep -v 'github.com/docker/cli/cli/image' \
 		)
+# PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER!
 
 go test -buildmode=pie -cover -ldflags -w -tags daemon -a -test.timeout=10m $PKG_LIST