diff -Nru ubuntu-snappy-1.7ubuntu1/debian/bzr-builder.manifest ubuntu-snappy-1.7ubuntu1/debian/bzr-builder.manifest
--- ubuntu-snappy-1.7ubuntu1/debian/bzr-builder.manifest	2015-11-20 14:02:46.000000000 +0000
+++ ubuntu-snappy-1.7ubuntu1/debian/bzr-builder.manifest	2015-11-21 14:01:38.000000000 +0000
@@ -1,2 +1,2 @@
-# bzr-builder format 0.3 deb-version {debupstream}-1+901
-lp:~snappy-dev/snappy/trunk-github revid:git-v1:2a00b46ca777a6e84a358fac69a8ae76482d6002
+# bzr-builder format 0.3 deb-version {debupstream}-1+903
+lp:~snappy-dev/snappy/trunk-github revid:git-v1:6c7fdcb3e0ffee76cf947e6224fe653edea8b4b9
diff -Nru ubuntu-snappy-1.7ubuntu1/debian/changelog ubuntu-snappy-1.7ubuntu1/debian/changelog
--- ubuntu-snappy-1.7ubuntu1/debian/changelog	2015-11-20 14:02:46.000000000 +0000
+++ ubuntu-snappy-1.7ubuntu1/debian/changelog	2015-11-21 14:01:38.000000000 +0000
@@ -1,8 +1,8 @@
-ubuntu-snappy (1.7ubuntu1-1+901~ubuntu16.04.1) xenial; urgency=low
+ubuntu-snappy (1.7ubuntu1-1+903~ubuntu16.04.1) xenial; urgency=low
 
   * Auto build.
 
- -- Launchpad Package Builder <noreply@launchpad.net>  Fri, 20 Nov 2015 14:02:46 +0000
+ -- Launchpad Package Builder <noreply@launchpad.net>  Sat, 21 Nov 2015 14:01:38 +0000
 
 ubuntu-snappy (1.7ubuntu1) UNRELEASED; urgency=medium
 
diff -Nru ubuntu-snappy-1.7ubuntu1/integration-tests/data/tpl/control ubuntu-snappy-1.7ubuntu1/integration-tests/data/tpl/control
--- ubuntu-snappy-1.7ubuntu1/integration-tests/data/tpl/control	2015-11-20 14:02:45.000000000 +0000
+++ ubuntu-snappy-1.7ubuntu1/integration-tests/data/tpl/control	2015-11-21 14:01:37.000000000 +0000
@@ -1,4 +1,4 @@
 {{ $filter := .Filter }}
 {{ $test := .Test }}
-Test-Command: ./integration-tests/scripts/reboot-wrapper {{ $test }} {{ if $filter }}-gocheck.f {{ $filter }}{{ end }}
+Test-Command: ./integration-tests/scripts/test-wrapper {{ $test }} {{ if $filter }}-gocheck.f {{ $filter }}{{ end }}
 Restrictions: allow-stderr
diff -Nru ubuntu-snappy-1.7ubuntu1/integration-tests/scripts/reboot-wrapper ubuntu-snappy-1.7ubuntu1/integration-tests/scripts/reboot-wrapper
--- ubuntu-snappy-1.7ubuntu1/integration-tests/scripts/reboot-wrapper	2015-11-20 14:02:45.000000000 +0000
+++ ubuntu-snappy-1.7ubuntu1/integration-tests/scripts/reboot-wrapper	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2015 Canonical Ltd
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# This runs the $1 go test binary and reboots if necessary.
-
-set -e
-
-TEST=$1
-NEEDS_REBOOT=/tmp/needs-reboot
-
-# We export the tests bin path so the snappy binary that might be compiled from
-# the branch is found.
-export PATH=$(pwd)/integration-tests/bin:$PATH
-
-# XXX sudo does not preserve the user PATH. A nicer way to solve this would be
-# to use an alias, but go exec.Command sets the full binary path.
-cat > $(pwd)/integration-tests/bin/sudo <<EOF
-#!/bin/bash
-/usr/bin/sudo env PATH=$PATH "\$@"
-EOF
-
-chmod +x $(pwd)/integration-tests/bin/sudo
-
-# shift to remove the test binary name (first argument) and be able to pass the rest
-# of them to it
-shift
-${TEST} -check.vv -test.outputdir=$ADT_ARTIFACTS-$ADT_REBOOT_MARK "$@"
-
-if [ -e ${NEEDS_REBOOT} ]; then
-    mark=`cat ${NEEDS_REBOOT}`
-    echo "Rebooting..."
-    sudo /tmp/autopkgtest-reboot "$mark"
-fi
diff -Nru ubuntu-snappy-1.7ubuntu1/integration-tests/scripts/test-wrapper ubuntu-snappy-1.7ubuntu1/integration-tests/scripts/test-wrapper
--- ubuntu-snappy-1.7ubuntu1/integration-tests/scripts/test-wrapper	1970-01-01 00:00:00.000000000 +0000
+++ ubuntu-snappy-1.7ubuntu1/integration-tests/scripts/test-wrapper	2015-11-21 14:01:37.000000000 +0000
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# Copyright (C) 2015 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# This runs the $1 go test binary and reboots if necessary.
+
+set -e
+
+TEST=$1
+NEEDS_REBOOT=/tmp/needs-reboot
+
+# We export the tests bin path so the snappy binary that might be compiled from
+# the branch is found.
+export PATH=$(pwd)/integration-tests/bin:$PATH
+
+# XXX sudo does not preserve the user PATH. A nicer way to solve this would be
+# to use an alias, but go exec.Command sets the full binary path.
+cat > $(pwd)/integration-tests/bin/sudo <<EOF
+#!/bin/bash
+/usr/bin/sudo env PATH=$PATH "\$@"
+EOF
+
+chmod +x $(pwd)/integration-tests/bin/sudo
+
+# adt-run copies the source tree with owner user:root.
+# In order for snappy to build the test snaps without sudo we need them to be
+# user:user so it can preserve the group id.
+chown -R $USER:$USER $(pwd)/integration-tests/data/snaps/
+
+# shift to remove the test binary name (first argument) and be able to pass the rest
+# of them to it
+shift
+${TEST} -check.vv -test.outputdir=$ADT_ARTIFACTS-$ADT_REBOOT_MARK "$@"
+
+if [ -e ${NEEDS_REBOOT} ]; then
+    mark=`cat ${NEEDS_REBOOT}`
+    echo "Rebooting..."
+    sudo /tmp/autopkgtest-reboot "$mark"
+fi
diff -Nru ubuntu-snappy-1.7ubuntu1/integration-tests/testutils/autopkgtest/autopkgtest_test.go ubuntu-snappy-1.7ubuntu1/integration-tests/testutils/autopkgtest/autopkgtest_test.go
--- ubuntu-snappy-1.7ubuntu1/integration-tests/testutils/autopkgtest/autopkgtest_test.go	2015-11-20 14:02:45.000000000 +0000
+++ ubuntu-snappy-1.7ubuntu1/integration-tests/testutils/autopkgtest/autopkgtest_test.go	2015-11-21 14:01:37.000000000 +0000
@@ -132,8 +132,8 @@
 func (s *AutopkgtestSuite) TestAdtRunLocalCallsExecCommand(c *check.C) {
 	s.subject.AdtRunLocal(imgPath)
 
-	outputDir := outputDir(testArtifactsPath)
-	expectedExecCommadCall := adtrunLocalCmd(controlFile, sourceCodePath, outputDir, imgPath)
+	testOutputDir := outputDir(testArtifactsPath)
+	expectedExecCommadCall := adtrunLocalCmd(controlFile, sourceCodePath, testOutputDir, imgPath)
 
 	c.Assert(s.execCalls[expectedExecCommadCall],
 		check.Equals, 1,
@@ -171,8 +171,8 @@
 func (s *AutopkgtestSuite) TestAdtRunRemoteCallsExecCommand(c *check.C) {
 	s.subject.AdtRunRemote(testbedIP, testbedPort)
 
-	outputDir := outputDir(testArtifactsPath)
-	expectedExecCommadCall := adtrunRemoteCmd(controlFile, sourceCodePath, outputDir, testbedIP, testbedPort)
+	testOutputDir := outputDir(testArtifactsPath)
+	expectedExecCommadCall := adtrunRemoteCmd(controlFile, sourceCodePath, testOutputDir, testbedIP, testbedPort)
 
 	c.Assert(s.execCalls[expectedExecCommadCall],
 		check.Equals, 1,
@@ -200,9 +200,9 @@
 		s.subject.shellOnFail = t.shellOnFail
 		s.subject.adtRun(t.testbedOptions)
 
-		outputDir := outputDir(testArtifactsPath)
+		testOutputDir := outputDir(testArtifactsPath)
 		expectedCommandCall := fmt.Sprintf(
-			adtrunTpl, controlFile, sourceCodePath, outputDir, t.expectedOptions)
+			adtrunTpl, controlFile, sourceCodePath, testOutputDir, t.expectedOptions)
 		c.Check(s.execCalls[expectedCommandCall], check.Equals, 1,
 			check.Commentf("Expected call %s not executed 1 time", expectedCommandCall))
 	}
diff -Nru ubuntu-snappy-1.7ubuntu1/integration-tests/testutils/build/build.go ubuntu-snappy-1.7ubuntu1/integration-tests/testutils/build/build.go
--- ubuntu-snappy-1.7ubuntu1/integration-tests/testutils/build/build.go	2015-11-20 14:02:45.000000000 +0000
+++ ubuntu-snappy-1.7ubuntu1/integration-tests/testutils/build/build.go	2015-11-21 14:01:37.000000000 +0000
@@ -48,7 +48,7 @@
 
 	// The output of the build commands for testing goes to the testsBinDir path,
 	// which is under the integration-tests directory. The
-	// integration-tests/reboot-wrapper script (Test-Command's entry point of
+	// integration-tests/test-wrapper script (Test-Command's entry point of
 	// adt-run) takes care of including testsBinDir at the beginning of $PATH, so
 	// that these binaries (if they exist) take precedence over the system ones
 	buildSnappyCliCmd = "go build -tags=excludeintegration -o " +