diff --git a/deb/publish_test.go b/deb/publish_test.go
index cb82b1d0..865acbd7 100644
--- a/deb/publish_test.go
+++ b/deb/publish_test.go
@@ -318,7 +318,7 @@ func (s *PublishedRepoSuite) TestString(c *C) {
 	c.Check(repo.String(), Equals,
 		"./squeeze (origin: myorigin, label: mylabel) [i386, amd64] publishes {main: [snap]: Snapshot from mirror [yandex]: http://mirror.yandex.ru/debian/ squeeze}")
 	c.Check(s.repo3.String(), Equals,
-		"linux/natty [] publishes {main: [snap]: Snapshot from mirror [yandex]: http://mirror.yandex.ru/debian/ squeeze}, {contrib: [snap]: Snapshot from mirror [yandex]: http://mirror.yandex.ru/debian/ squeeze}")
+		"linux/natty [] publishes {contrib: [snap]: Snapshot from mirror [yandex]: http://mirror.yandex.ru/debian/ squeeze}, {main: [snap]: Snapshot from mirror [yandex]: http://mirror.yandex.ru/debian/ squeeze}")
 }
 
 func (s *PublishedRepoSuite) TestKey(c *C) {
diff --git a/system/t06_publish/PublishSwitch8Test_gold b/system/t06_publish/PublishSwitch8Test_gold
index f22e3604..7c56dc98 100644
--- a/system/t06_publish/PublishSwitch8Test_gold
+++ b/system/t06_publish/PublishSwitch8Test_gold
@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '/Users/smira/.aptly/public/dists/maverick/Release.tmp' with gpg, please enter your passphrase when prompted:
-Clearsigning file '/Users/smira/.aptly/public/dists/maverick/Release.tmp' with gpg, please enter your passphrase when prompted:
+Signing file '${HOME}/.aptly/public/dists/maverick/Release.tmp' with gpg, please enter your passphrase when prompted:
+Clearsigning file '${HOME}/.aptly/public/dists/maverick/Release.tmp' with gpg, please enter your passphrase when prompted:
 Cleaning up prefix "." components b, c...
 
 Publish for snapshot ./maverick [amd64, i386, source] publishes {a: [snap1]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick}, {b: [snap3]: Pulled into 'snap2' with 'snap1' as source, pull request was: 'gnuplot-x11'}, {c: [local2]: Snapshot from local repo [local-repo]} has been successfully switched to new snapshot.