Merge lp:~wwitzel3/juju-core/009-ha-rsyslog-api into lp:~go-bot/juju-core/trunk

[Wayne Witzel III]

rsyslog: ensure logs accumulate on state machines

Added a WatchForRsyslogChanges watcher and extended the API with
GetRsyslogConfig. Changed the rsyslog worker to use these additions.

https://codereview.appspot.com/94510043/

rsyslog: ensure logs accumulate on state machines

Added a WatchForRsyslogChanges watcher and extended the API with
GetRsyslogConfig. Changed the rsyslog worker to use these additions.

https://codereview.appspot.com/94510043/

[Wayne Witzel III (wwitzel3)]

Reviewers: mp+219703_code.launchpad.net,

Message:
Please take a look.

Description:
rsyslog: ensure logs accumulate on state machines

Added a WatchForRsyslogChanges watcher and extended the API with
GetRsyslongConfig. Changed the rsyslog worker to use these additions.

https://code.launchpad.net/~wwitzel3/juju-core/009-ha-rsyslog-api/+merge/219703

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/94510043/

Affected files (+272, -49 lines):
   A [revision details]
   M state/api/params/params.go
   M state/api/rsyslog/rsyslog.go
   M state/api/rsyslog/rsyslog_test.go
   A state/apiserver/rsyslog/config.go
   M state/apiserver/rsyslog/rsyslog.go
   M state/apiserver/rsyslog/rsyslog_test.go
   M worker/rsyslog/rsyslog_test.go
   M worker/rsyslog/worker.go

[Wayne Witzel III (wwitzel3)]

https://codereview.appspot.com/94510043/diff/1/state/api/params/params.go
File state/api/params/params.go (right):

https://codereview.appspot.com/94510043/diff/1/state/api/params/params.go#newcode684
state/api/params/params.go:684: // RsyslogConfigResult holds the result
of an GetRsyslogConfig
s/an/a

https://codereview.appspot.com/94510043/

[Michael Foord (mfoord)]

https://codereview.appspot.com/94510043/diff/1/state/api/rsyslog/rsyslog.go
File state/api/rsyslog/rsyslog.go (right):

https://codereview.appspot.com/94510043/diff/1/state/api/rsyslog/rsyslog.go#newcode58
state/api/rsyslog/rsyslog.go:58: fmt.Printf("tag: %s", agentTag)
That's a debugging Printf I guess...

https://codereview.appspot.com/94510043/

[Wayne Witzel III (wwitzel3)]

Please take a look.

https://codereview.appspot.com/94510043/

[Wayne Witzel III (wwitzel3)]

Manually tested many scenarios against virtual maas and ec2. Including
going from non-HA to HA with units deployed and not deployed.

https://codereview.appspot.com/94510043/

[William Reade (fwereade)]

I think this is generally solid but I have a few questions.

https://codereview.appspot.com/94510043/diff/20001/state/api/params/params.go
File state/api/params/params.go (right):

https://codereview.appspot.com/94510043/diff/20001/state/api/params/params.go#newcode687
state/api/params/params.go:687: Port int
/eyebrow

Why do we need both port and hostports?

https://codereview.appspot.com/94510043/diff/20001/state/apiserver/rsyslog/rsyslog.go
File state/apiserver/rsyslog/rsyslog.go (right):

https://codereview.appspot.com/94510043/diff/20001/state/apiserver/rsyslog/rsyslog.go#newcode90
state/apiserver/rsyslog/rsyslog.go:90: watch :=
api.st.WatchAPIHostPorts()
ISTM that this won't trigger on rsyslog-ca-cert changes.

I guess I'm out of date re: rsyslog-ca-cert -- would you ping me when
you're online so we can discuss?

https://codereview.appspot.com/94510043/diff/20001/worker/rsyslog/worker.go
File worker/rsyslog/worker.go (right):

https://codereview.appspot.com/94510043/diff/20001/worker/rsyslog/worker.go#newcode129
worker/rsyslog/worker.go:129: return h.st.WatchForRsyslogChanges(h.tag)
Do we need tag? I *think* it's implicit in the connection. Probably I'm
wrong?

https://codereview.appspot.com/94510043/

[Michael Foord (mfoord)]

On 2014/05/16 09:21:24, fwereade wrote:
> I think this is generally solid but I have a few questions.

https://codereview.appspot.com/94510043/diff/20001/state/api/params/params.go
> File state/api/params/params.go (right):

https://codereview.appspot.com/94510043/diff/20001/state/api/params/params.go#newcode687
> state/api/params/params.go:687: Port int
> /eyebrow

> Why do we need both port and hostports?

We could lose Port, we kept it mainly because that's how the *existing*
system works.

https://codereview.appspot.com/94510043/diff/20001/state/apiserver/rsyslog/rsyslog.go
> File state/apiserver/rsyslog/rsyslog.go (right):

https://codereview.appspot.com/94510043/diff/20001/state/apiserver/rsyslog/rsyslog.go#newcode90
> state/apiserver/rsyslog/rsyslog.go:90: watch :=
api.st.WatchAPIHostPorts()
> ISTM that this won't trigger on rsyslog-ca-cert changes.

> I guess I'm out of date re: rsyslog-ca-cert -- would you ping me when
you're
> online so we can discuss?

So we had a big discussion about this issue (is watching APIHostPorts
alone sufficient or not)?
No-one wanted to commit to an answer, but the consensus seemed to be if
we're treating the rsyslog config entries as "immutable once set" then
watching APIHostPorts alone to trigger rsyslog config rewriting should
be enough. And it works for the scenarios we've manually tested:

* non-HA with unit deployed
* HA without units
* HA then units deployed
* non-HA with units deployed then ensure-availability

rsyslog config is rewritten in all these cases and logging happens
correctly, so the only wrinkle would be if the rsyslog config can be
written out *before* the certificate is set for the first time on
bootstrap - in which case it wouldn't be rewritten. When we asked nobody
thought that was likely, but no-one would *commit* to it being
impossible, however "they" (jam and natefinch) did think that if we're
treating the rsyslog config as "immutable once set" then watching just
APIHostPorts *should* be sufficient. So that's what we did.

https://codereview.appspot.com/94510043/diff/20001/worker/rsyslog/worker.go
> File worker/rsyslog/worker.go (right):

https://codereview.appspot.com/94510043/diff/20001/worker/rsyslog/worker.go#newcode129
> worker/rsyslog/worker.go:129: return
h.st.WatchForRsyslogChanges(h.tag)
> Do we need tag? I *think* it's implicit in the connection. Probably
I'm wrong?

It is sent by other code, so we sent it. We don't need it in our API
endpoint itself.

https://codereview.appspot.com/94510043/

[Michael Foord (mfoord)]

On 2014/05/16 10:34:34, mfoord wrote:
> On 2014/05/16 09:21:24, fwereade wrote:
> > I think this is generally solid but I have a few questions.
> >
> >
https://codereview.appspot.com/94510043/diff/20001/state/api/params/params.go
> > File state/api/params/params.go (right):
> >
> >

https://codereview.appspot.com/94510043/diff/20001/state/api/params/params.go#newcode687
> > state/api/params/params.go:687: Port int
> > /eyebrow
> >
> > Why do we need both port and hostports?
> >

> We could lose Port, we kept it mainly because that's how the
*existing* system
> works.

And in fact we store the rsyslogPort in the EnvironConfig, so we
probably still need it for backwards compatibility without a bigger
refactor than *strictly* necessary at this stage. If you'd like us to do
that refactor now we can.

We probably should still use the HostPorts for the template rendering
which we haven't yet done.

https://codereview.appspot.com/94510043/

[Michael Foord (mfoord)]

https://codereview.appspot.com/94510043/diff/20001/worker/rsyslog/worker.go
File worker/rsyslog/worker.go (right):

https://codereview.appspot.com/94510043/diff/20001/worker/rsyslog/worker.go#newcode152
worker/rsyslog/worker.go:152: if cfg.Port == h.syslogPort &&
rsyslogCACert == h.rsyslogCACert {
This will actually screw us over. If APIHosts changes, but not the port
nor the cert, then the conf won't get rewritten. So this needs to
change.

https://codereview.appspot.com/94510043/

[Michael Foord (mfoord)]

On 2014/05/19 10:02:47, mfoord wrote:

https://codereview.appspot.com/94510043/diff/20001/worker/rsyslog/worker.go
> File worker/rsyslog/worker.go (right):

https://codereview.appspot.com/94510043/diff/20001/worker/rsyslog/worker.go#newcode152
> worker/rsyslog/worker.go:152: if cfg.Port == h.syslogPort &&
rsyslogCACert ==
> h.rsyslogCACert {
> This will actually screw us over. If APIHosts changes, but not the
port nor the
> cert, then the conf won't get rewritten. So this needs to change.

Note that I've removed this in a separate branch, along with an obsolete
test that now fails, in the following branch:

https://code.launchpad.net/~mfoord/juju-core/ha-rsyslog-shortcut-removal/+merge/220105

Andrew Wilkins (axw) is fairly certain that by the time the
rsyslogworker is created the port is in the environment, and starting
the rsyslog worker already ensures the ca-cert will be available, so
just watching APIHostPorts should be safe (regarding rsyslog config
writing and restarting).

https://codereview.appspot.com/94510043/

[Wayne Witzel III (wwitzel3)]

Please take a look.

https://codereview.appspot.com/94510043/

[William Reade (fwereade)]

Last few changes, otherwise looking good. Thanks.

https://codereview.appspot.com/94510043/diff/40001/state/api/params/params.go
File state/api/params/params.go (right):

https://codereview.appspot.com/94510043/diff/40001/state/api/params/params.go#newcode687
state/api/params/params.go:687: Port int
please document that Port is just there for compatibility, and capable
clients should trust the HostPorts.

https://codereview.appspot.com/94510043/diff/40001/state/api/rsyslog/rsyslog.go
File state/api/rsyslog/rsyslog.go (right):

https://codereview.appspot.com/94510043/diff/40001/state/api/rsyslog/rsyslog.go#newcode20
state/api/rsyslog/rsyslog.go:20: Port int
I think you can completely drop Port from this one, right?

https://codereview.appspot.com/94510043/diff/40001/state/apiserver/rsyslog/rsyslog.go
File state/apiserver/rsyslog/rsyslog.go (left):

https://codereview.appspot.com/94510043/diff/40001/state/apiserver/rsyslog/rsyslog.go#oldcode33
state/apiserver/rsyslog/rsyslog.go:33: func (api *RsyslogAPI)
SetRsyslogCert(args params.SetRsyslogCertParams) (params.ErrorResult,
error) {
This still bugs me but it's not actionable right now.

https://codereview.appspot.com/94510043/diff/40001/state/apiserver/rsyslog/rsyslog.go
File state/apiserver/rsyslog/rsyslog.go (right):

https://codereview.appspot.com/94510043/diff/40001/state/apiserver/rsyslog/rsyslog.go#newcode27
state/apiserver/rsyslog/rsyslog.go:27: if !authorizer.AuthMachineAgent()
&& !authorizer.AuthUnitAgent() {
do we have an AuthAgent? maybe we should

https://codereview.appspot.com/94510043/diff/40001/state/apiserver/rsyslog/rsyslog.go#newcode63
state/apiserver/rsyslog/rsyslog.go:63: func (api *RsyslogAPI)
GetRsyslogConfig() (params.RsyslogConfigResult, error) {
Heh, almost missed this. Please make it bulky, like
WatchForRsyslogChanges below; I can't see when we'll need it but I'd
prefer to remain consistent.

https://codereview.appspot.com/94510043/

[Michael Foord (mfoord)]

On 2014/05/21 08:06:30, fwereade wrote:
> Last few changes, otherwise looking good. Thanks.

https://codereview.appspot.com/94510043/diff/40001/state/api/params/params.go
> File state/api/params/params.go (right):

https://codereview.appspot.com/94510043/diff/40001/state/api/params/params.go#newcode687
> state/api/params/params.go:687: Port int
> please document that Port is just there for compatibility, and capable
clients
> should trust the HostPorts.

The Port is there for state servers to know which port to listen on. It
isn't used by units. I've added a note to this effect.

https://codereview.appspot.com/94510043/diff/40001/state/api/rsyslog/rsyslog.go
> File state/api/rsyslog/rsyslog.go (right):

https://codereview.appspot.com/94510043/diff/40001/state/api/rsyslog/rsyslog.go#newcode20
> state/api/rsyslog/rsyslog.go:20: Port int
> I think you can completely drop Port from this one, right?

As discussed we can't drop this until state servers have a mechanism for
picking a port and storing it in the state, so that GetRsyslogConfig can
then return the right information in HostPorts. I've added a note that
the Port is only for state servers to know which port to listen on.

https://codereview.appspot.com/94510043/diff/40001/state/apiserver/rsyslog/rsyslog.go
> File state/apiserver/rsyslog/rsyslog.go (left):

https://codereview.appspot.com/94510043/diff/40001/state/apiserver/rsyslog/rsyslog.go#oldcode33
> state/apiserver/rsyslog/rsyslog.go:33: func (api *RsyslogAPI)
> SetRsyslogCert(args params.SetRsyslogCertParams) (params.ErrorResult,
error) {
> This still bugs me but it's not actionable right now.

Right.

https://codereview.appspot.com/94510043/diff/40001/state/apiserver/rsyslog/rsyslog.go
> File state/apiserver/rsyslog/rsyslog.go (right):

https://codereview.appspot.com/94510043/diff/40001/state/apiserver/rsyslog/rsyslog.go#newcode27
> state/apiserver/rsyslog/rsyslog.go:27: if
!authorizer.AuthMachineAgent() &&
> !authorizer.AuthUnitAgent() {
> do we have an AuthAgent? maybe we should

We don't. Adding it was more trouble that it was worth for a single use
case. John is working on making srvRoot more testable, so if we see
another use case for this method it can be added then.

https://codereview.appspot.com/94510043/diff/40001/state/apiserver/rsyslog/rsyslog.go#newcode63
> state/apiserver/rsyslog/rsyslog.go:63: func (api *RsyslogAPI)
GetRsyslogConfig()
> (params.RsyslogConfigResult, error) {
> Heh, almost missed this. Please make it bulky, like
WatchForRsyslogChanges
> below; I can't see when we'll need it but I'd prefer to remain
consistent.

Ok, working on this. Also some test failures I see with the current
state of this branch.

https://codereview.appspot.com/94510043/

[lp:~wwitzel3/juju-core/009-ha-rsyslog-api]

2747. By Wayne Witzel III on 2014-05-22

merge mfoord

2748. By Wayne Witzel III on 2014-05-22

revert merge

2749. By Wayne Witzel III on 2014-05-22

merge mfoord

2750. By Wayne Witzel III on 2014-05-22

merge trunk

[Michael Foord (mfoord)]

Unfortunately we mangled this branch, so will repropose from this
branch:

https://code.launchpad.net/~mfoord/juju-core/ha-rsyslog-good/+merge/220669

https://codereview.appspot.com/94510043/

[Michael Foord (mfoord)]

On 2014/05/22 15:25:43, mfoord wrote:
> Unfortunately we mangled this branch, so will repropose from this
branch:

https://code.launchpad.net/~mfoord/juju-core/ha-rsyslog-good/+merge/220669

Superseded by: https://codereview.appspot.com/91630045/

https://codereview.appspot.com/94510043/

[William Reade (fwereade)]

Rejecting because dead.

Unmerged revisions

2750. By Wayne Witzel III on 2014-05-22

merge trunk

2749. By Wayne Witzel III on 2014-05-22

merge mfoord

2748. By Wayne Witzel III on 2014-05-22

revert merge

2747. By Wayne Witzel III on 2014-05-22

merge mfoord

=== modified file 'agent/agent_test.go'
--- agent/agent_test.go	2014-05-20 04:27:02 +0000
+++ agent/agent_test.go	2014-05-22 14:33:28 +0000
@@ -15,12 +15,12 @@
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
 	"launchpad.net/juju-core/state/api/params"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/version"
 )
 
 type suite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&suite{})

=== modified file 'agent/bootstrap_test.go'
--- agent/bootstrap_test.go	2014-05-20 04:27:02 +0000
+++ agent/bootstrap_test.go	2014-05-22 14:33:28 +0000
@@ -16,35 +16,36 @@
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"
 )
 
 type bootstrapSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 	testing.MgoSuite
 }
 
 var _ = gc.Suite(&bootstrapSuite{})
 
 func (s *bootstrapSuite) SetUpSuite(c *gc.C) {
-	s.BaseSuite.SetUpSuite(c)
+	s.LoggingSuite.SetUpSuite(c)
 	s.MgoSuite.SetUpSuite(c)
 }
 
 func (s *bootstrapSuite) TearDownSuite(c *gc.C) {
 	s.MgoSuite.TearDownSuite(c)
-	s.BaseSuite.TearDownSuite(c)
+	s.LoggingSuite.TearDownSuite(c)
 }
 
 func (s *bootstrapSuite) SetUpTest(c *gc.C) {
-	s.BaseSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	s.MgoSuite.SetUpTest(c)
 }
 
 func (s *bootstrapSuite) TearDownTest(c *gc.C) {
 	s.MgoSuite.TearDownTest(c)
-	s.BaseSuite.TearDownTest(c)
+	s.LoggingSuite.TearDownTest(c)
 }
 
 func (s *bootstrapSuite) TestInitializeState(c *gc.C) {

=== modified file 'agent/format-1.16_whitebox_test.go'
--- agent/format-1.16_whitebox_test.go	2014-05-20 04:27:02 +0000
+++ agent/format-1.16_whitebox_test.go	2014-05-22 14:33:28 +0000
@@ -14,13 +14,13 @@
 	jc "github.com/juju/testing/checkers"
 
 	gc "launchpad.net/gocheck"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"
 )
 
 type format_1_16Suite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&format_1_16Suite{})

=== modified file 'agent/format-1.18_whitebox_test.go'
--- agent/format-1.18_whitebox_test.go	2014-05-20 04:27:02 +0000
+++ agent/format-1.18_whitebox_test.go	2014-05-22 14:33:28 +0000
@@ -14,13 +14,13 @@
 
 	gc "launchpad.net/gocheck"
 	"launchpad.net/juju-core/state/api/params"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"
 )
 
 type format_1_18Suite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&format_1_18Suite{})

=== modified file 'agent/format_whitebox_test.go'
--- agent/format_whitebox_test.go	2014-05-20 04:27:02 +0000
+++ agent/format_whitebox_test.go	2014-05-22 14:33:28 +0000
@@ -11,12 +11,12 @@
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/state/api/params"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/version"
 )
 
 type formatSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&formatSuite{})

=== modified file 'agent/identity_test.go'
--- agent/identity_test.go	2014-05-20 04:27:02 +0000
+++ agent/identity_test.go	2014-05-22 14:33:28 +0000
@@ -10,12 +10,12 @@
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/state/api/params"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/version"
 )
 
 type identitySuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 	mongodConfigPath string
 	mongodPath       string
 }

=== removed file 'agent/mongo/export_test.go'
--- agent/mongo/export_test.go	2014-05-20 08:29:58 +0000
+++ agent/mongo/export_test.go	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-// Copyright 2014 Canonical Ltd.
-// Licensed under the AGPLv3, see LICENCE file for details.
-
-package mongo
-
-var (
-	MakeJournalDirs             = makeJournalDirs
-	MongoConfigPath             = &mongoConfigPath
-	NoauthCommand               = noauthCommand
-	ProcessSignal               = &processSignal
-	SharedSecretPath            = sharedSecretPath
-	SSLKeyPath                  = sslKeyPath
-	UpstartConfInstall          = &upstartConfInstall
-	UpstartService              = upstartService
-	UpstartServiceStopAndRemove = &upstartServiceStopAndRemove
-	UpstartServiceStop          = &upstartServiceStop
-	UpstartServiceStart         = &upstartServiceStart
-)

=== modified file 'agent/mongo/mongo.go'
--- agent/mongo/mongo.go	2014-05-14 11:38:13 +0000
+++ agent/mongo/mongo.go	2014-05-22 14:33:28 +0000
@@ -285,7 +285,6 @@
 		" --noprealloc" +
 		" --syslog" +
 		" --smallfiles" +
-		" --journal" +
 		" --keyFile " + utils.ShQuote(sharedSecretPath(dataDir))
 	if withHA {
 		mongoCmd += " --replSet " + ReplicaSetName
@@ -374,7 +373,6 @@
 		"--noprealloc",
 		"--syslog",
 		"--smallfiles",
-		"--journal",
 	)
 	return cmd, nil
 }

=== modified file 'agent/mongo/mongo_test.go'
--- agent/mongo/mongo_test.go	2014-05-20 08:29:58 +0000
+++ agent/mongo/mongo_test.go	2014-05-22 14:33:28 +0000
@@ -1,7 +1,7 @@
 // Copyright 2014 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package mongo_test
+package mongo
 
 import (
 	"encoding/base64"
@@ -18,10 +18,9 @@
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/agent/mongo"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/state/api/params"
-	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/upstart"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"
@@ -30,7 +29,7 @@
 func Test(t *stdtesting.T) { gc.TestingT(t) }
 
 type MongoSuite struct {
-	coretesting.BaseSuite
+	testbase.LoggingSuite
 	mongodConfigPath string
 	mongodPath       string
 
@@ -51,24 +50,24 @@
 }
 
 func (s *MongoSuite) SetUpTest(c *gc.C) {
-	s.BaseSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	// Try to make sure we don't execute any commands accidentally.
 	s.PatchEnvironment("PATH", "")
 
 	s.mongodPath = filepath.Join(c.MkDir(), "mongod")
 	err := ioutil.WriteFile(s.mongodPath, []byte("#!/bin/bash\n\nprintf %s 'db version v2.4.9'\n"), 0755)
 	c.Assert(err, gc.IsNil)
-	s.PatchValue(&mongo.JujuMongodPath, s.mongodPath)
+	s.PatchValue(&JujuMongodPath, s.mongodPath)
 
 	testPath := c.MkDir()
 	s.mongodConfigPath = filepath.Join(testPath, "mongodConfig")
-	s.PatchValue(mongo.MongoConfigPath, s.mongodConfigPath)
+	s.PatchValue(&mongoConfigPath, s.mongodConfigPath)
 
-	s.PatchValue(mongo.UpstartConfInstall, func(conf *upstart.Conf) error {
+	s.PatchValue(&upstartConfInstall, func(conf *upstart.Conf) error {
 		s.installed = append(s.installed, *conf)
 		return s.installError
 	})
-	s.PatchValue(mongo.UpstartServiceStopAndRemove, func(svc *upstart.Service) error {
+	s.PatchValue(&upstartServiceStopAndRemove, func(svc *upstart.Service) error {
 		s.removed = append(s.removed, *svc)
 		return s.removeError
 	})
@@ -80,23 +79,23 @@
 }
 
 func (s *MongoSuite) TestJujuMongodPath(c *gc.C) {
-	obtained, err := mongo.Path()
+	obtained, err := Path()
 	c.Check(err, gc.IsNil)
 	c.Check(obtained, gc.Equals, s.mongodPath)
 }
 
 func (s *MongoSuite) TestDefaultMongodPath(c *gc.C) {
-	s.PatchValue(&mongo.JujuMongodPath, "/not/going/to/exist/mongod")
+	s.PatchValue(&JujuMongodPath, "/not/going/to/exist/mongod")
 	s.PatchEnvPathPrepend(filepath.Dir(s.mongodPath))
 
-	obtained, err := mongo.Path()
+	obtained, err := Path()
 	c.Check(err, gc.IsNil)
 	c.Check(obtained, gc.Equals, s.mongodPath)
 }
 
 func (s *MongoSuite) TestMakeJournalDirs(c *gc.C) {
 	dir := c.MkDir()
-	err := mongo.MakeJournalDirs(dir)
+	err := makeJournalDirs(dir)
 	c.Assert(err, gc.IsNil)
 
 	testJournalDirs(dir, c)
@@ -127,7 +126,7 @@
 
 	mockShellCommand(c, &s.CleanupSuite, "apt-get")
 
-	err := mongo.EnsureServer(dataDir, namespace, testInfo, mongo.WithHA)
+	err := EnsureServer(dataDir, namespace, testInfo, WithHA)
 	c.Assert(err, gc.IsNil)
 
 	testJournalDirs(dbDir, c)
@@ -148,17 +147,17 @@
 	c.Assert(err, gc.IsNil)
 	c.Assert(contents, jc.DeepEquals, []byte("ENABLE_MONGODB=no"))
 
-	contents, err = ioutil.ReadFile(mongo.SSLKeyPath(dataDir))
+	contents, err = ioutil.ReadFile(sslKeyPath(dataDir))
 	c.Assert(err, gc.IsNil)
 	c.Assert(string(contents), gc.Equals, testInfo.Cert+"\n"+testInfo.PrivateKey)
 
-	contents, err = ioutil.ReadFile(mongo.SharedSecretPath(dataDir))
+	contents, err = ioutil.ReadFile(sharedSecretPath(dataDir))
 	c.Assert(err, gc.IsNil)
 	c.Assert(string(contents), gc.Equals, testInfo.SharedSecret)
 
 	s.installed = nil
 	// now check we can call it multiple times without error
-	err = mongo.EnsureServer(dataDir, namespace, testInfo, mongo.WithHA)
+	err = EnsureServer(dataDir, namespace, testInfo, WithHA)
 	c.Assert(err, gc.IsNil)
 	assertInstalled()
 
@@ -194,7 +193,7 @@
 
 		s.PatchValue(&version.Current.Series, test.series)
 
-		err := mongo.EnsureServer(dataDir, namespace, testInfo, mongo.WithHA)
+		err := EnsureServer(dataDir, namespace, testInfo, WithHA)
 		c.Assert(err, gc.IsNil)
 
 		cmds := getMockShellCalls(c, output)
@@ -215,40 +214,17 @@
 func (s *MongoSuite) TestUpstartServiceWithHA(c *gc.C) {
 	dataDir := c.MkDir()
 
-	svc, _, err := mongo.UpstartService("", dataDir, dataDir, 1234, mongo.WithHA)
+	svc, _, err := upstartService("", dataDir, dataDir, 1234, WithHA)
 	c.Assert(err, gc.IsNil)
 	c.Assert(strings.Contains(svc.Cmd, "--replSet"), jc.IsTrue)
 
-	svc, _, err = mongo.UpstartService("", dataDir, dataDir, 1234, mongo.WithoutHA)
+	svc, _, err = upstartService("", dataDir, dataDir, 1234, WithoutHA)
 	c.Assert(err, gc.IsNil)
 	c.Assert(strings.Contains(svc.Cmd, "--replSet"), jc.IsFalse)
 }
 
-func (s *MongoSuite) TestUpstartServiceWithJournal(c *gc.C) {
-	dataDir := c.MkDir()
-
-	svc, _, err := mongo.UpstartService("", dataDir, dataDir, 1234, mongo.WithHA)
-	c.Assert(err, gc.IsNil)
-	journalPresent := strings.Contains(svc.Cmd, " --journal ") || strings.HasSuffix(svc.Cmd, " --journal")
-	c.Assert(journalPresent, jc.IsTrue)
-}
-
-func (s *MongoSuite) TestNoAuthCommandWithJournal(c *gc.C) {
-	dataDir := c.MkDir()
-
-	cmd, err := mongo.NoauthCommand(dataDir, 1234)
-	c.Assert(err, gc.IsNil)
-	var isJournalPresent bool
-	for _, value := range cmd.Args {
-		if value == "--journal" {
-			isJournalPresent = true
-		}
-	}
-	c.Assert(isJournalPresent, jc.IsTrue)
-}
-
 func (s *MongoSuite) TestRemoveService(c *gc.C) {
-	err := mongo.RemoveService("namespace")
+	err := RemoveService("namespace")
 	c.Assert(err, gc.IsNil)
 	c.Assert(s.removed, jc.DeepEquals, []upstart.Service{{
 		Name:    "juju-db-namespace",
@@ -265,11 +241,11 @@
 	// test that we call add-apt-repository only for quantal (and that if it
 	// fails, we return the error)
 	s.PatchValue(&version.Current.Series, "quantal")
-	err := mongo.EnsureServer(dir, "", testInfo, mongo.WithHA)
+	err := EnsureServer(dir, "", testInfo, WithHA)
 	c.Assert(err, gc.ErrorMatches, "cannot install mongod: cannot add apt repository: exit status 1.*")
 
 	s.PatchValue(&version.Current.Series, "trusty")
-	err = mongo.EnsureServer(dir, "", testInfo, mongo.WithHA)
+	err = EnsureServer(dir, "", testInfo, WithHA)
 	c.Assert(err, gc.IsNil)
 }
 
@@ -278,7 +254,7 @@
 	// created.
 	mockShellCommand(c, &s.CleanupSuite, "apt-get")
 	dataDir := filepath.Join(c.MkDir(), "dir", "data")
-	err := mongo.EnsureServer(dataDir, "", testInfo, mongo.WithHA)
+	err := EnsureServer(dataDir, "", testInfo, WithHA)
 	c.Check(err, gc.IsNil)
 
 	_, err = os.Stat(filepath.Join(dataDir, "db"))
@@ -286,9 +262,9 @@
 }
 
 func (s *MongoSuite) TestServiceName(c *gc.C) {
-	name := mongo.ServiceName("foo")
+	name := ServiceName("foo")
 	c.Assert(name, gc.Equals, "juju-db-foo")
-	name = mongo.ServiceName("")
+	name = ServiceName("")
 	c.Assert(name, gc.Equals, "juju-db")
 }
 
@@ -303,7 +279,7 @@
 		NetworkName:  "public",
 		NetworkScope: instance.NetworkPublic}}
 
-	address := mongo.SelectPeerAddress(addresses)
+	address := SelectPeerAddress(addresses)
 	c.Assert(address, gc.Equals, "10.0.0.1")
 }
 
@@ -325,12 +301,12 @@
 		},
 		Port: 37017}}
 
-	address := mongo.SelectPeerHostPort(hostPorts)
+	address := SelectPeerHostPort(hostPorts)
 	c.Assert(address, gc.Equals, "10.0.0.1:37017")
 }
 
 func (s *MongoSuite) TestGenerateSharedSecret(c *gc.C) {
-	secret, err := mongo.GenerateSharedSecret()
+	secret, err := GenerateSharedSecret()
 	c.Assert(err, gc.IsNil)
 	c.Assert(secret, gc.HasLen, 1024)
 	_, err = base64.StdEncoding.DecodeString(secret)
@@ -344,7 +320,7 @@
 	s.PatchValue(&version.Current.Series, "quantal")
 
 	dataDir := c.MkDir()
-	err := mongo.EnsureServer(dataDir, "", testInfo, mongo.WithHA)
+	err := EnsureServer(dataDir, "", testInfo, WithHA)
 	c.Assert(err, gc.IsNil)
 
 	c.Assert(getMockShellCalls(c, addAptRepoOut), gc.DeepEquals, [][]string{{

=== modified file 'agent/mongo/upgrade.go'
--- agent/mongo/upgrade.go	2014-05-22 00:56:59 +0000
+++ agent/mongo/upgrade.go	2014-05-22 14:33:28 +0000
@@ -8,15 +8,12 @@
 	"os"
 	"os/exec"
 	"syscall"
-	"time"
 
 	"labix.org/v2/mgo"
 
 	"launchpad.net/juju-core/upstart"
 )
 
-const mongoSocketTimeout = 10 * time.Second
-
 var (
 	processSignal = (*os.Process).Signal
 )
@@ -54,13 +51,11 @@
 	if err != nil {
 		return false, fmt.Errorf("can't dial mongo to ensure admin user: %v", err)
 	}
-	session.SetSocketTimeout(mongoSocketTimeout)
 	err = session.DB("admin").Login(p.User, p.Password)
 	session.Close()
 	if err == nil {
 		return false, nil
 	}
-	logger.Debugf("admin login failed: %v", err)
 
 	// Login failed, so we need to add the user.
 	// Stop mongo, so we can start it in --noauth mode.

=== modified file 'agent/mongo/upgrade_test.go'
--- agent/mongo/upgrade_test.go	2014-05-22 09:52:11 +0000
+++ agent/mongo/upgrade_test.go	2014-05-22 14:33:28 +0000
@@ -1,45 +1,35 @@
 // Copyright 2014 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package mongo_test
+package mongo
 
 import (
 	"net"
-	"os"
-	"path/filepath"
 	"strconv"
 
-	jujutesting "github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	"labix.org/v2/mgo"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/agent/mongo"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/upstart"
 )
 
 type EnsureAdminSuite struct {
-	coretesting.BaseSuite
-	serviceStarts int
-	serviceStops  int
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&EnsureAdminSuite{})
 
 func (s *EnsureAdminSuite) SetUpTest(c *gc.C) {
-	s.BaseSuite.SetUpTest(c)
-	s.serviceStarts = 0
-	s.serviceStops = 0
-	s.PatchValue(mongo.UpstartConfInstall, func(conf *upstart.Conf) error {
-		return nil
-	})
-	s.PatchValue(mongo.UpstartServiceStart, func(svc *upstart.Service) error {
-		s.serviceStarts++
-		return nil
-	})
-	s.PatchValue(mongo.UpstartServiceStop, func(svc *upstart.Service) error {
-		s.serviceStops++
+	s.PatchValue(&upstartConfInstall, func(conf *upstart.Conf) error {
+		return nil
+	})
+	s.PatchValue(&upstartServiceStart, func(svc *upstart.Service) error {
+		return nil
+	})
+	s.PatchValue(&upstartServiceStop, func(svc *upstart.Service) error {
 		return nil
 	})
 }
@@ -50,50 +40,14 @@
 	c.Assert(err, gc.IsNil)
 	defer inst.DestroyWithLog()
 	dialInfo := inst.DialInfo()
-
-	// Mock out mongod, so the --noauth execution doesn't
-	// do anything nasty. Also mock out the Signal method.
-	jujutesting.PatchExecutableAsEchoArgs(c, s, "mongod")
-	mongodDir := filepath.SplitList(os.Getenv("PATH"))[0]
-	s.PatchValue(&mongo.JujuMongodPath, filepath.Join(mongodDir, "mongod"))
-	s.PatchValue(mongo.ProcessSignal, func(*os.Process, os.Signal) error {
-		return nil
-	})
-
 	// First call succeeds, as there are no users yet.
 	added, err := s.ensureAdminUser(c, dialInfo, "whomever", "whatever")
 	c.Assert(err, gc.IsNil)
 	c.Assert(added, jc.IsTrue)
-
-	// EnsureAdminUser should have stopped the mongo service,
-	// started a new mongod with --noauth, and then finally
-	// started the service back up.
-	c.Assert(s.serviceStarts, gc.Equals, 1)
-	c.Assert(s.serviceStops, gc.Equals, 1)
-	_, portString, err := net.SplitHostPort(dialInfo.Addrs[0])
-	c.Assert(err, gc.IsNil)
-	jujutesting.AssertEchoArgs(c, "mongod",
-		"--noauth",
-		"--dbpath", "db",
-		"--sslOnNormalPorts",
-		"--sslPEMKeyFile", "server.pem",
-		"--sslPEMKeyPassword", "ignored",
-		"--bind_ip", "127.0.0.1",
-		"--port", portString,
-		"--noprealloc",
-		"--syslog",
-		"--smallfiles",
-		"--journal",
-	)
-
 	// Second call succeeds, as the admin user is already there.
 	added, err = s.ensureAdminUser(c, dialInfo, "whomever", "whatever")
 	c.Assert(err, gc.IsNil)
 	c.Assert(added, jc.IsFalse)
-
-	// There should have been no additional start/stop.
-	c.Assert(s.serviceStarts, gc.Equals, 1)
-	c.Assert(s.serviceStops, gc.Equals, 1)
 }
 
 func (s *EnsureAdminSuite) TestEnsureAdminUserError(c *gc.C) {
@@ -119,7 +73,7 @@
 	c.Assert(err, gc.IsNil)
 	port, err := strconv.Atoi(portString)
 	c.Assert(err, gc.IsNil)
-	return mongo.EnsureAdminUser(mongo.EnsureAdminUserParams{
+	return EnsureAdminUser(EnsureAdminUserParams{
 		DialInfo: dialInfo,
 		Port:     port,
 		User:     user,

=== modified file 'agent/tools/diskmanager_test.go'
--- agent/tools/diskmanager_test.go	2014-05-20 04:27:02 +0000
+++ agent/tools/diskmanager_test.go	2014-05-22 14:33:28 +0000
@@ -13,6 +13,7 @@
 
 	agenttools "launchpad.net/juju-core/agent/tools"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
@@ -22,13 +23,13 @@
 var _ agenttools.ToolsManager = (*agenttools.DiskManager)(nil)
 
 type DiskManagerSuite struct {
-	coretesting.BaseSuite
+	testbase.LoggingSuite
 	dataDir string
 	manager agenttools.ToolsManager
 }
 
 func (s *DiskManagerSuite) SetUpTest(c *gc.C) {
-	s.BaseSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	s.dataDir = c.MkDir()
 	s.manager = agenttools.NewDiskManager(s.dataDir)
 }

=== modified file 'agent/tools/tools_test.go'
--- agent/tools/tools_test.go	2014-05-20 04:27:02 +0000
+++ agent/tools/tools_test.go	2014-05-22 14:33:28 +0000
@@ -21,14 +21,14 @@
 )
 
 type ToolsSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 	dataDir string
 }
 
 var _ = gc.Suite(&ToolsSuite{})
 
 func (t *ToolsSuite) SetUpTest(c *gc.C) {
-	t.BaseSuite.SetUpTest(c)
+	t.LoggingSuite.SetUpTest(c)
 	t.dataDir = c.MkDir()
 }
 

=== modified file 'bzr/bzr_test.go'
--- bzr/bzr_test.go	2014-05-20 04:27:02 +0000
+++ bzr/bzr_test.go	2014-05-22 14:33:28 +0000
@@ -8,22 +8,22 @@
 	"os"
 	"os/exec"
 	"path/filepath"
-	stdtesting "testing"
+	"testing"
 
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/bzr"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
-func Test(t *stdtesting.T) {
+func Test(t *testing.T) {
 	gc.TestingT(t)
 }
 
 var _ = gc.Suite(&BzrSuite{})
 
 type BzrSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 	b *bzr.Branch
 }
 
@@ -32,7 +32,7 @@
 `
 
 func (s *BzrSuite) SetUpTest(c *gc.C) {
-	s.BaseSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	bzrdir := c.MkDir()
 	s.PatchEnvironment("BZR_HOME", bzrdir)
 	err := os.Mkdir(filepath.Join(bzrdir, ".bazaar"), 0755)

=== modified file 'charm/dir_test.go'
--- charm/dir_test.go	2014-05-20 04:27:02 +0000
+++ charm/dir_test.go	2014-05-22 14:33:28 +0000
@@ -17,10 +17,11 @@
 
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type DirSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&DirSuite{})

=== modified file 'cloudinit/cloudinit_test.go'
--- cloudinit/cloudinit_test.go	2014-05-20 04:27:02 +0000
+++ cloudinit/cloudinit_test.go	2014-05-22 14:33:28 +0000
@@ -10,14 +10,14 @@
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/cloudinit"
-	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	sshtesting "launchpad.net/juju-core/utils/ssh/testing"
 )
 
 // TODO integration tests, but how?
 
 type S struct {
-	coretesting.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(S{})

=== modified file 'cloudinit/sshinit/configure_test.go'
--- cloudinit/sshinit/configure_test.go	2014-05-20 04:27:02 +0000
+++ cloudinit/sshinit/configure_test.go	2014-05-22 14:33:28 +0000
@@ -17,12 +17,13 @@
 	envtools "launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/state/api/params"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
 
 type configureSuite struct {
-	coretesting.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&configureSuite{})

=== modified file 'cmd/charm-admin/config_test.go'
--- cmd/charm-admin/config_test.go	2014-05-20 04:27:02 +0000
+++ cmd/charm-admin/config_test.go	2014-05-22 14:33:28 +0000
@@ -12,10 +12,11 @@
 
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type ConfigSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&ConfigSuite{})
@@ -27,11 +28,11 @@
 `
 
 func (s *ConfigSuite) SetUpSuite(c *gc.C) {
-	s.BaseSuite.SetUpSuite(c)
+	s.LoggingSuite.SetUpSuite(c)
 }
 
 func (s *ConfigSuite) TearDownSuite(c *gc.C) {
-	s.BaseSuite.TearDownSuite(c)
+	s.LoggingSuite.TearDownSuite(c)
 }
 
 type SomeConfigCommand struct {

=== modified file 'cmd/charm-admin/deletecharm_test.go'
--- cmd/charm-admin/deletecharm_test.go	2014-05-20 04:27:02 +0000
+++ cmd/charm-admin/deletecharm_test.go	2014-05-22 14:33:28 +0000
@@ -13,10 +13,11 @@
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/store"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type DeleteCharmSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&DeleteCharmSuite{})
@@ -26,11 +27,11 @@
 `
 
 func (s *DeleteCharmSuite) SetUpSuite(c *gc.C) {
-	s.BaseSuite.SetUpSuite(c)
+	s.LoggingSuite.SetUpSuite(c)
 }
 
 func (s *DeleteCharmSuite) TearDownSuite(c *gc.C) {
-	s.BaseSuite.TearDownSuite(c)
+	s.LoggingSuite.TearDownSuite(c)
 }
 
 func (s *DeleteCharmSuite) TestInit(c *gc.C) {

=== modified file 'cmd/envcmd/environmentcommand_test.go'
--- cmd/envcmd/environmentcommand_test.go	2014-05-16 01:33:13 +0000
+++ cmd/envcmd/environmentcommand_test.go	2014-05-22 14:33:28 +0000
@@ -20,13 +20,21 @@
 )
 
 type EnvironmentCommandSuite struct {
-	coretesting.FakeJujuHomeSuite
+	home *coretesting.FakeHome
 }
 
 var _ = gc.Suite(&EnvironmentCommandSuite{})
 
 func Test(t *testing.T) { gc.TestingT(t) }
 
+func (s *EnvironmentCommandSuite) SetUpTest(c *gc.C) {
+	s.home = coretesting.MakeEmptyFakeHome(c)
+}
+
+func (s *EnvironmentCommandSuite) TearDownTest(c *gc.C) {
+	s.home.Restore()
+}
+
 func (s *EnvironmentCommandSuite) TestReadCurrentEnvironmentUnset(c *gc.C) {
 	env := envcmd.ReadCurrentEnvironment()
 	c.Assert(env, gc.Equals, "")
@@ -40,9 +48,6 @@
 }
 
 func (s *EnvironmentCommandSuite) TestGetDefaultEnvironmentNothingSet(c *gc.C) {
-	envPath := coretesting.HomePath(".juju", "environments.yaml")
-	err := os.Remove(envPath)
-	c.Assert(err, gc.IsNil)
 	env, err := envcmd.GetDefaultEnvironment()
 	c.Assert(env, gc.Equals, "")
 	c.Assert(err, jc.Satisfies, environs.IsNoEnv)
@@ -95,12 +100,12 @@
 	c.Assert(*envName, gc.Equals, "explicit")
 
 	// Take environment name from the default.
-	coretesting.WriteEnvironments(c, coretesting.MultipleEnvConfig)
+	defer coretesting.MakeFakeHome(c, coretesting.MultipleEnvConfig).Restore()
 	testEnsureEnvName(c, coretesting.SampleEnvName)
 
 	// Take environment name from the one and only environment,
 	// even if it is not explicitly marked as default.
-	coretesting.WriteEnvironments(c, coretesting.SingleEnvConfigNoDefault)
+	defer coretesting.MakeFakeHome(c, coretesting.SingleEnvConfigNoDefault).Restore()
 	testEnsureEnvName(c, coretesting.SampleEnvName)
 
 	// If there is a current-environment file, use that.
@@ -109,16 +114,13 @@
 }
 
 func (s *EnvironmentCommandSuite) TestEnvironCommandInitErrors(c *gc.C) {
-	envPath := coretesting.HomePath(".juju", "environments.yaml")
-	err := os.Remove(envPath)
-	c.Assert(err, gc.IsNil)
 	cmd, _ := prepareEnvCommand(c, "")
-	err = cmd.Init(nil)
+	err := cmd.Init(nil)
 	c.Assert(err, jc.Satisfies, environs.IsNoEnv)
 
 	// If there are multiple environments but no default,
 	// an error should be returned.
-	coretesting.WriteEnvironments(c, coretesting.MultipleEnvConfigNoDefault)
+	defer coretesting.MakeFakeHome(c, coretesting.MultipleEnvConfigNoDefault).Restore()
 	cmd, _ = prepareEnvCommand(c, "")
 	err = cmd.Init(nil)
 	c.Assert(err, gc.Equals, envcmd.ErrNoEnvironmentSpecified)

=== modified file 'cmd/filevar_test.go'
--- cmd/filevar_test.go	2014-05-16 01:33:13 +0000
+++ cmd/filevar_test.go	2014-05-22 14:33:28 +0000
@@ -17,7 +17,6 @@
 )
 
 type FileVarSuite struct {
-	testing.FakeHomeSuite
 	ctx         *cmd.Context
 	ValidPath   string
 	InvalidPath string // invalid path refers to a file which is not readable
@@ -26,7 +25,6 @@
 var _ = gc.Suite(&FileVarSuite{})
 
 func (s *FileVarSuite) SetUpTest(c *gc.C) {
-	s.FakeHomeSuite.SetUpTest(c)
 	s.ctx = testing.Context(c)
 	s.ValidPath = s.ctx.AbsPath("valid.yaml")
 	s.InvalidPath = s.ctx.AbsPath("invalid.yaml")
@@ -41,6 +39,7 @@
 }
 
 func (s *FileVarSuite) TestTildeFileVar(c *gc.C) {
+	defer testing.MakeEmptyFakeHome(c).Restore()
 	path := filepath.Join(osenv.Home(), "config.yaml")
 	err := ioutil.WriteFile(path, []byte("abc"), 0644)
 	c.Assert(err, gc.IsNil)

=== renamed file 'cmd/juju/user_add.go' => 'cmd/juju/adduser.go'
=== renamed file 'cmd/juju/user_add_test.go' => 'cmd/juju/adduser_test.go'
=== modified file 'cmd/juju/authorizedkeys_test.go'
--- cmd/juju/authorizedkeys_test.go	2014-05-16 04:20:04 +0000
+++ cmd/juju/authorizedkeys_test.go	2014-05-22 14:33:28 +0000
@@ -15,11 +15,13 @@
 	keymanagerserver "launchpad.net/juju-core/state/apiserver/keymanager"
 	keymanagertesting "launchpad.net/juju-core/state/apiserver/keymanager/testing"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	sshtesting "launchpad.net/juju-core/utils/ssh/testing"
 )
 
 type AuthorizedKeysSuite struct {
-	coretesting.FakeJujuHomeSuite
+	testbase.LoggingSuite
+	jujuHome *coretesting.FakeHome
 }
 
 var _ = gc.Suite(&AuthorizedKeysSuite{})
@@ -32,6 +34,16 @@
 	"list",
 }
 
+func (s *AuthorizedKeysSuite) SetUpTest(c *gc.C) {
+	s.LoggingSuite.SetUpTest(c)
+	s.jujuHome = coretesting.MakeEmptyFakeHome(c)
+}
+
+func (s *AuthorizedKeysSuite) TearDownTest(c *gc.C) {
+	s.jujuHome.Restore()
+	s.LoggingSuite.TearDownTest(c)
+}
+
 func (s *AuthorizedKeysSuite) TestHelpCommands(c *gc.C) {
 	// Check that we have correctly registered all the sub commands
 	// by checking the help output.

=== modified file 'cmd/juju/bootstrap_test.go'
--- cmd/juju/bootstrap_test.go	2014-05-21 22:15:10 +0000
+++ cmd/juju/bootstrap_test.go	2014-05-22 14:33:28 +0000
@@ -5,7 +5,6 @@
 
 import (
 	"fmt"
-	"os"
 	"strings"
 
 	"github.com/juju/errors"
@@ -31,12 +30,13 @@
 	"launchpad.net/juju-core/juju/arch"
 	"launchpad.net/juju-core/provider/dummy"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
 
 type BootstrapSuite struct {
-	coretesting.FakeJujuHomeSuite
+	testbase.LoggingSuite
 	coretesting.MgoSuite
 	envtesting.ToolsFixture
 }
@@ -44,12 +44,12 @@
 var _ = gc.Suite(&BootstrapSuite{})
 
 func (s *BootstrapSuite) SetUpSuite(c *gc.C) {
-	s.FakeJujuHomeSuite.SetUpSuite(c)
+	s.LoggingSuite.SetUpSuite(c)
 	s.MgoSuite.SetUpSuite(c)
 }
 
 func (s *BootstrapSuite) SetUpTest(c *gc.C) {
-	s.FakeJujuHomeSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	s.MgoSuite.SetUpTest(c)
 	s.ToolsFixture.SetUpTest(c)
 
@@ -62,13 +62,13 @@
 
 func (s *BootstrapSuite) TearDownSuite(c *gc.C) {
 	s.MgoSuite.TearDownSuite(c)
-	s.FakeJujuHomeSuite.TearDownSuite(c)
+	s.LoggingSuite.TearDownSuite(c)
 }
 
 func (s *BootstrapSuite) TearDownTest(c *gc.C) {
 	s.ToolsFixture.TearDownTest(c)
 	s.MgoSuite.TearDownTest(c)
-	s.FakeJujuHomeSuite.TearDownTest(c)
+	s.LoggingSuite.TearDownTest(c)
 	dummy.Reset()
 }
 
@@ -130,7 +130,8 @@
 			toolsVersions = append(toolsVersions, testVersion)
 		}
 	}
-	resetJujuHome(c)
+	_, fake := makeEmptyFakeHome(c)
+	defer fake.Restore()
 	sourceDir := createToolsSource(c, toolsVersions)
 	s.PatchValue(&envtools.DefaultBaseURL, sourceDir)
 
@@ -176,7 +177,8 @@
 func (test bootstrapTest) run(c *gc.C) {
 	// Create home with dummy provider and remove all
 	// of its envtools.
-	env := resetJujuHome(c)
+	env, fake := makeEmptyFakeHome(c)
+	defer fake.Restore()
 
 	if test.version != "" {
 		useVersion := strings.Replace(test.version, "%LTS%", config.LatestLtsSeries(), 1)
@@ -368,7 +370,8 @@
 }}
 
 func (s *BootstrapSuite) TestBootstrapTwice(c *gc.C) {
-	env := resetJujuHome(c)
+	env, fake := makeEmptyFakeHome(c)
+	defer fake.Restore()
 	defaultSeriesVersion := version.Current
 	defaultSeriesVersion.Series = config.PreferredSeries(env.Config())
 	// Force a dev version by having an odd minor version number.
@@ -400,7 +403,8 @@
 	s.PatchValue(&getBootstrapFuncs, func() BootstrapInterface {
 		return _bootstrap
 	})
-	resetJujuHome(c)
+	_, fake := makeEmptyFakeHome(c)
+	defer fake.Restore()
 
 	ctx, err := coretesting.RunCommand(c, envcmd.Wrap(&BootstrapCommand{}),
 		[]string{"--upload-tools", argVariant, "foo,bar"})
@@ -411,7 +415,8 @@
 }
 
 func (s *BootstrapSuite) TestBootstrapJenvWarning(c *gc.C) {
-	env := resetJujuHome(c)
+	env, fake := makeEmptyFakeHome(c)
+	defer fake.Restore()
 	defaultSeriesVersion := version.Current
 	defaultSeriesVersion.Series = config.PreferredSeries(env.Config())
 	// Force a dev version by having an odd minor version number.
@@ -437,7 +442,8 @@
 
 func (s *BootstrapSuite) TestInvalidLocalSource(c *gc.C) {
 	s.PatchValue(&version.Current.Number, version.MustParse("1.2.0"))
-	env := resetJujuHome(c)
+	env, fake := makeEmptyFakeHome(c)
+	defer fake.Restore()
 
 	// Bootstrap the environment with an invalid source.
 	// The command returns with an error.
@@ -485,7 +491,8 @@
 
 func (s *BootstrapSuite) TestUploadLocalImageMetadata(c *gc.C) {
 	sourceDir, expected := createImageMetadata(c)
-	env := resetJujuHome(c)
+	env, fake := makeEmptyFakeHome(c)
+	defer fake.Restore()
 
 	// Bootstrap the environment with the valid source.
 	// Force a dev version by having an odd minor version number.
@@ -506,7 +513,8 @@
 func (s *BootstrapSuite) TestAutoSyncLocalSource(c *gc.C) {
 	sourceDir := createToolsSource(c, vAll)
 	s.PatchValue(&version.Current.Number, version.MustParse("1.2.0"))
-	env := resetJujuHome(c)
+	env, fake := makeEmptyFakeHome(c)
+	defer fake.Restore()
 
 	// Bootstrap the environment with the valid source.
 	// The bootstrapping has to show no error, because the tools
@@ -534,7 +542,9 @@
 
 	// Create home with dummy provider and remove all
 	// of its envtools.
-	return resetJujuHome(c)
+	env, fake := makeEmptyFakeHome(c)
+	s.AddCleanup(func(*gc.C) { fake.Restore() })
+	return env
 }
 
 func (s *BootstrapSuite) TestAutoUploadAfterFailedSync(c *gc.C) {
@@ -602,7 +612,8 @@
 }
 
 func (s *BootstrapSuite) TestBootstrapDestroy(c *gc.C) {
-	resetJujuHome(c)
+	_, fake := makeEmptyFakeHome(c)
+	defer fake.Restore()
 	devVersion := version.Current
 	// Force a dev version by having an odd minor version number.
 	// This is because we have not uploaded any tools and auto
@@ -640,19 +651,16 @@
 	return source
 }
 
-// resetJujuHome restores an new, clean Juju home environment without tools.
-func resetJujuHome(c *gc.C) environs.Environ {
-	jenvDir := coretesting.HomePath(".juju", "environments")
-	err := os.RemoveAll(jenvDir)
-	c.Assert(err, gc.IsNil)
-	coretesting.WriteEnvironments(c, envConfig)
+// makeEmptyFakeHome creates a faked home without envtools.
+func makeEmptyFakeHome(c *gc.C) (environs.Environ, *coretesting.FakeHome) {
+	fake := coretesting.MakeFakeHome(c, envConfig)
 	dummy.Reset()
 	store, err := configstore.Default()
 	c.Assert(err, gc.IsNil)
 	env, err := environs.PrepareFromName("peckham", nullContext(c), store)
 	c.Assert(err, gc.IsNil)
 	envtesting.RemoveAllTools(c, env)
-	return env
+	return env, fake
 }
 
 // checkTools check if the environment contains the passed envtools.

=== modified file 'cmd/juju/cmd_test.go'
--- cmd/juju/cmd_test.go	2014-05-16 01:33:13 +0000
+++ cmd/juju/cmd_test.go	2014-05-22 14:33:28 +0000
@@ -22,6 +22,7 @@
 
 type CmdSuite struct {
 	testing.JujuConnSuite
+	home *coretesting.FakeHome
 }
 
 var _ = gc.Suite(&CmdSuite{})
@@ -49,10 +50,11 @@
 
 func (s *CmdSuite) SetUpTest(c *gc.C) {
 	s.JujuConnSuite.SetUpTest(c)
-	coretesting.WriteEnvironments(c, envConfig, "peckham", "walthamstow", "brokenenv")
+	s.home = coretesting.MakeFakeHome(c, envConfig, "peckham", "walthamstow", "brokenenv")
 }
 
 func (s *CmdSuite) TearDownTest(c *gc.C) {
+	s.home.Restore()
 	s.JujuConnSuite.TearDownTest(c)
 }
 

=== modified file 'cmd/juju/debuglog_test.go'
--- cmd/juju/debuglog_test.go	2014-05-15 05:14:01 +0000
+++ cmd/juju/debuglog_test.go	2014-05-22 14:33:28 +0000
@@ -21,7 +21,7 @@
 )
 
 type DebugLogSuite struct {
-	testing.FakeJujuHomeSuite
+	testing.FakeHomeSuite
 }
 
 var _ = gc.Suite(&DebugLogSuite{})

=== modified file 'cmd/juju/deploy.go'
--- cmd/juju/deploy.go	2014-05-15 10:12:36 +0000
+++ cmd/juju/deploy.go	2014-05-22 14:33:28 +0000
@@ -66,32 +66,6 @@
 by set-constraints).
 
 Charms can be deployed to a specific machine using the --to argument.
-If the destination is an LXC container the default is to use lxc-clone
-to create the container where possible. For Ubuntu deployments, lxc-clone
-is supported for the trusty OS series and later. A 'template' container is
-created with the name
-  juju-<series>-template
-where <series> is the OS series, for example 'juju-trusty-template'.
-
-You can override the use of clone by changing the provider configuration:
-  lxc-clone: false
-
-If you have the main container directory mounted on a btrfs partition,
-then the clone will be using btrfs snapshots to create the containers.
-This means that clones use up much less disk space.  If you do not have btrfs,
-lxc will attempt to use aufs (an overlay type filesystem). You can
-explicitly ask Juju to create full containers and not overlays by specifying
-the following in the provider configuration:
-  lxc-clone-aufs: false
-
-Examples:
-   juju deploy mysql --to 23       (deploy to machine 23)
-   juju deploy mysql --to 24/lxc/3 (deploy to lxc container 3 on host machine 24)
-   juju deploy mysql --to lxc:25   (deploy to a new lxc container on host machine 25)
-   
-   juju deploy mysql -n 5 --constraints mem=8G (deploy 5 instances of mysql with at least 8 GB of RAM each)
-
-   juju deploy mysql --networks=storage,mynet --exclude-networks=logging
 
 Like constraints, service-specific network requirements can be
 specified with --networks and --exclude-networks arguments, both can
@@ -101,6 +75,15 @@
 and to ensure none of the networks in --exclude-networks are added to
 the service's machines. Not supported on all providers.
 
+Examples:
+   juju deploy mysql --to 23       (Deploy to machine 23)
+   juju deploy mysql --to 24/lxc/3 (Deploy to lxc container 3 on host machine 24)
+   juju deploy mysql --to lxc:25   (Deploy to a new lxc container on host machine 25)
+   
+   juju deploy mysql -n 5 --constraints mem=8G (deploy 5 instances of mysql with at least 8 GB of RAM each)
+
+   juju deploy mysql --networks=storage,mynet --exclude-networks=logging
+
 See Also:
    juju help constraints
    juju help set-constraints

=== modified file 'cmd/juju/help_topics.go'
--- cmd/juju/help_topics.go	2014-05-15 10:12:36 +0000
+++ cmd/juju/help_topics.go	2014-05-22 14:33:28 +0000
@@ -79,23 +79,22 @@
   juju deploy wordpress
   juju add-relation wordpress mysql
 
-For Ubuntu deployments, the local provider will prefer to use lxc-clone to create
-the machines for the trusty OS series and later.
-A 'template' container is created with the name
+As of trusty, the local provider will prefer to use lxc-clone to create
+the machines. A 'template' container is created with the name
   juju-<series>-template
-where <series> is the OS series, for example 'juju-trusty-template'.
+where <series> is the OS series, for example 'juju-precise-template'.
 You can override the use of clone by specifying
-  lxc-clone: true
+  use-clone: true
 or
-  lxc-clone: false
+  use-clone: false
 in the configuration for your local provider.  If you have the main container
 directory mounted on a btrfs partition, then the clone will be using btrfs
-snapshots to create the containers. This means that clones use up much
+snapshots to create the containers. This means that the clones use up much
 less disk space.  If you do not have btrfs, lxc will attempt to use aufs
-(an overlay type filesystem). You can explicitly ask Juju to create
+(which is an overlay type filesystem). You can explicitly ask Juju to create
 full containers and not overlays by specifying the following in the provider
 configuration:
-  lxc-clone-aufs: false
+  use-clone-aufs: false
 
 
 References:

=== modified file 'cmd/juju/helptool_test.go'
--- cmd/juju/helptool_test.go	2014-05-16 04:20:04 +0000
+++ cmd/juju/helptool_test.go	2014-05-22 14:33:28 +0000
@@ -13,11 +13,19 @@
 )
 
 type HelpToolSuite struct {
-	testing.FakeJujuHomeSuite
+	home *testing.FakeHome
 }
 
 var _ = gc.Suite(&HelpToolSuite{})
 
+func (suite *HelpToolSuite) SetUpTest(c *gc.C) {
+	suite.home = testing.MakeSampleHome(c)
+}
+
+func (suite *HelpToolSuite) TearDownTest(c *gc.C) {
+	suite.home.Restore()
+}
+
 func (suite *HelpToolSuite) TestHelpToolHelp(c *gc.C) {
 	output := badrun(c, 0, "help", "help-tool")
 	c.Assert(output, gc.Equals, `usage: juju help-tool [tool]

=== modified file 'cmd/juju/init_test.go'
--- cmd/juju/init_test.go	2014-05-16 04:20:04 +0000
+++ cmd/juju/init_test.go	2014-05-22 14:33:28 +0000
@@ -6,7 +6,6 @@
 import (
 	"bytes"
 	"io/ioutil"
-	"os"
 	"strings"
 
 	gc "launchpad.net/gocheck"
@@ -16,7 +15,6 @@
 )
 
 type InitSuite struct {
-	testing.FakeJujuHomeSuite
 }
 
 var _ = gc.Suite(&InitSuite{})
@@ -24,9 +22,7 @@
 // The environments.yaml is created by default if it
 // does not already exist.
 func (*InitSuite) TestBoilerPlateEnvironment(c *gc.C) {
-	envPath := testing.HomePath(".juju", "environments.yaml")
-	err := os.Remove(envPath)
-	c.Assert(err, gc.IsNil)
+	defer testing.MakeEmptyFakeHome(c).Restore()
 	ctx := testing.Context(c)
 	code := cmd.Main(&InitCommand{}, ctx, nil)
 	c.Check(code, gc.Equals, 0)
@@ -43,9 +39,7 @@
 // The boilerplate is sent to stdout with --show, and the environments.yaml
 // is not created.
 func (*InitSuite) TestBoilerPlatePrinted(c *gc.C) {
-	envPath := testing.HomePath(".juju", "environments.yaml")
-	err := os.Remove(envPath)
-	c.Assert(err, gc.IsNil)
+	defer testing.MakeEmptyFakeHome(c).Restore()
 	ctx := testing.Context(c)
 	code := cmd.Main(&InitCommand{}, ctx, []string{"--show"})
 	c.Check(code, gc.Equals, 0)
@@ -53,7 +47,7 @@
 	strippedOut := strings.Replace(outStr, "\n", "", -1)
 	c.Check(strippedOut, gc.Matches, ".*# This is the Juju config file, which you can use.*")
 	environpath := testing.HomePath(".juju", "environments.yaml")
-	_, err = ioutil.ReadFile(environpath)
+	_, err := ioutil.ReadFile(environpath)
 	c.Assert(err, gc.NotNil)
 }
 
@@ -68,7 +62,7 @@
 // An existing environments.yaml will not be overwritten without
 // the explicit -f option.
 func (*InitSuite) TestExistingEnvironmentNotOverwritten(c *gc.C) {
-	testing.WriteEnvironments(c, existingEnv)
+	defer testing.MakeFakeHome(c, existingEnv, "existing").Restore()
 
 	ctx := testing.Context(c)
 	code := cmd.Main(&InitCommand{}, ctx, nil)
@@ -85,7 +79,7 @@
 // An existing environments.yaml will be overwritten when -f is
 // given explicitly.
 func (*InitSuite) TestExistingEnvironmentOverwritten(c *gc.C) {
-	testing.WriteEnvironments(c, existingEnv)
+	defer testing.MakeFakeHome(c, existingEnv, "existing").Restore()
 
 	ctx := testing.Context(c)
 	code := cmd.Main(&InitCommand{}, ctx, []string{"-f"})

=== modified file 'cmd/juju/main.go'
--- cmd/juju/main.go	2014-05-20 01:23:55 +0000
+++ cmd/juju/main.go	2014-05-22 14:33:28 +0000
@@ -141,9 +141,6 @@
 	// Manage authorized ssh keys.
 	r.Register(NewAuthorizedKeysCommand())
 
-	// Manage users and access
-	r.Register(NewUserCommand())
-
 	// Manage state server availability.
 	r.Register(wrapEnvCommand(&EnsureAvailabilityCommand{}))
 

=== modified file 'cmd/juju/main_test.go'
--- cmd/juju/main_test.go	2014-05-20 01:23:55 +0000
+++ cmd/juju/main_test.go	2014-05-22 14:33:28 +0000
@@ -31,7 +31,7 @@
 }
 
 type MainSuite struct {
-	testing.FakeJujuHomeSuite
+	testing.FakeHomeSuite
 }
 
 var _ = gc.Suite(&MainSuite{})
@@ -79,6 +79,7 @@
 }
 
 func (s *MainSuite) TestRunMain(c *gc.C) {
+	defer testing.MakeSampleHome(c).Restore()
 	// The test array structure needs to be inline here as some of the
 	// expected values below use deployHelpText().  This constructs the deploy
 	// command and runs gets the help for it.  When the deploy command is
@@ -183,6 +184,7 @@
 
 func (s *MainSuite) TestActualRunJujuArgsBeforeCommand(c *gc.C) {
 	c.Skip("breaks test isolation: lp:1233601")
+	defer testing.MakeFakeHomeNoEnvironments(c, "one").Restore()
 	// Check global args work when specified before command
 	msg := breakJuju(c, "Bootstrap")
 	logpath := filepath.Join(c.MkDir(), "log")
@@ -196,6 +198,7 @@
 
 func (s *MainSuite) TestActualRunJujuArgsAfterCommand(c *gc.C) {
 	c.Skip("breaks test isolation: lp:1233601")
+	defer testing.MakeFakeHomeNoEnvironments(c, "one").Restore()
 	// Check global args work when specified after command
 	msg := breakJuju(c, "Bootstrap")
 	logpath := filepath.Join(c.MkDir(), "log")
@@ -259,7 +262,6 @@
 	"unset-environment",
 	"upgrade-charm",
 	"upgrade-juju",
-	"user",
 	"version",
 }
 

=== modified file 'cmd/juju/plugin_test.go'
--- cmd/juju/plugin_test.go	2014-05-15 05:14:01 +0000
+++ cmd/juju/plugin_test.go	2014-05-22 14:33:28 +0000
@@ -15,24 +15,28 @@
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type PluginSuite struct {
-	testing.FakeJujuHomeSuite
+	testbase.LoggingSuite
 	oldPath string
+	home    *testing.FakeHome
 }
 
 var _ = gc.Suite(&PluginSuite{})
 
 func (suite *PluginSuite) SetUpTest(c *gc.C) {
-	suite.FakeJujuHomeSuite.SetUpTest(c)
+	suite.LoggingSuite.SetUpTest(c)
 	suite.oldPath = os.Getenv("PATH")
+	suite.home = testing.MakeSampleHome(c)
 	os.Setenv("PATH", "/bin:"+testing.HomePath())
 }
 
 func (suite *PluginSuite) TearDownTest(c *gc.C) {
+	suite.home.Restore()
 	os.Setenv("PATH", suite.oldPath)
-	suite.FakeJujuHomeSuite.TearDownTest(c)
+	suite.LoggingSuite.TearDownTest(c)
 }
 
 func (*PluginSuite) TestFindPlugins(c *gc.C) {

=== modified file 'cmd/juju/publish_test.go'
--- cmd/juju/publish_test.go	2014-05-15 05:14:01 +0000
+++ cmd/juju/publish_test.go	2014-05-22 14:33:28 +0000
@@ -14,14 +14,16 @@
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 // Sadly, this is a very slow test suite, heavily dominated by calls to bzr.
 
 type PublishSuite struct {
-	testing.FakeJujuHomeSuite
+	testbase.LoggingSuite
 	testing.HTTPSuite
 
+	home       *testing.FakeHome
 	dir        string
 	oldBaseURL string
 	branch     *bzr.Branch
@@ -57,7 +59,7 @@
 const pollDelay = testing.ShortWait
 
 func (s *PublishSuite) SetUpSuite(c *gc.C) {
-	s.FakeJujuHomeSuite.SetUpSuite(c)
+	s.LoggingSuite.SetUpSuite(c)
 	s.HTTPSuite.SetUpSuite(c)
 
 	s.oldBaseURL = charm.Store.BaseURL
@@ -65,16 +67,16 @@
 }
 
 func (s *PublishSuite) TearDownSuite(c *gc.C) {
-	s.FakeJujuHomeSuite.TearDownSuite(c)
+	s.LoggingSuite.TearDownSuite(c)
 	s.HTTPSuite.TearDownSuite(c)
 
 	charm.Store.BaseURL = s.oldBaseURL
 }
 
 func (s *PublishSuite) SetUpTest(c *gc.C) {
-	s.FakeJujuHomeSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	s.HTTPSuite.SetUpTest(c)
-	s.FakeJujuHomeSuite.Home.AddFiles(c, testing.TestFile{
+	s.home = testing.MakeSampleHome(c, testing.TestFile{
 		Name: ".bazaar/bazaar.conf",
 		Data: "[DEFAULT]\nemail = Test <[e-mail]>\n",
 	})
@@ -86,8 +88,9 @@
 }
 
 func (s *PublishSuite) TearDownTest(c *gc.C) {
+	s.home.Restore()
 	s.HTTPSuite.TearDownTest(c)
-	s.FakeJujuHomeSuite.TearDownTest(c)
+	s.LoggingSuite.TearDownTest(c)
 }
 
 func (s *PublishSuite) TestNoBranch(c *gc.C) {

=== modified file 'cmd/juju/run_test.go'
--- cmd/juju/run_test.go	2014-05-15 05:14:01 +0000
+++ cmd/juju/run_test.go	2014-05-22 14:33:28 +0000
@@ -18,7 +18,7 @@
 )
 
 type RunSuite struct {
-	testing.FakeJujuHomeSuite
+	testing.FakeHomeSuite
 }
 
 var _ = gc.Suite(&RunSuite{})

=== modified file 'cmd/juju/switch_test.go'
--- cmd/juju/switch_test.go	2014-05-16 04:20:04 +0000
+++ cmd/juju/switch_test.go	2014-05-22 14:33:28 +0000
@@ -14,51 +14,50 @@
 )
 
 type SwitchSimpleSuite struct {
-	testing.FakeJujuHomeSuite
 }
 
 var _ = gc.Suite(&SwitchSimpleSuite{})
 
 func (*SwitchSimpleSuite) TestNoEnvironment(c *gc.C) {
-	envPath := testing.HomePath(".juju", "environments.yaml")
-	err := os.Remove(envPath)
-	c.Assert(err, gc.IsNil)
-	_, err = testing.RunCommand(c, &SwitchCommand{}, nil)
+	defer testing.MakeEmptyFakeHome(c).Restore()
+	_, err := testing.RunCommand(c, &SwitchCommand{}, nil)
 	c.Assert(err, gc.ErrorMatches, "couldn't read the environment")
 }
 
 func (*SwitchSimpleSuite) TestNoDefault(c *gc.C) {
-	testing.WriteEnvironments(c, testing.MultipleEnvConfigNoDefault)
+	defer testing.MakeFakeHome(c, testing.MultipleEnvConfigNoDefault).Restore()
 	_, err := testing.RunCommand(c, &SwitchCommand{}, nil)
 	c.Assert(err, gc.ErrorMatches, "no currently specified environment")
 }
 
 func (*SwitchSimpleSuite) TestShowsDefault(c *gc.C) {
-	testing.WriteEnvironments(c, testing.MultipleEnvConfig)
+	defer testing.MakeFakeHome(c, testing.MultipleEnvConfig).Restore()
 	context, err := testing.RunCommand(c, &SwitchCommand{}, nil)
 	c.Assert(err, gc.IsNil)
 	c.Assert(testing.Stdout(context), gc.Equals, "erewhemos\n")
 }
 
-func (s *SwitchSimpleSuite) TestCurrentEnvironmentHasPrecidence(c *gc.C) {
-	testing.WriteEnvironments(c, testing.MultipleEnvConfig)
-	s.FakeHomeSuite.Home.AddFiles(c, testing.TestFile{".juju/current-environment", "fubar"})
+func (*SwitchSimpleSuite) TestCurrentEnvironmentHasPrecidence(c *gc.C) {
+	home := testing.MakeFakeHome(c, testing.MultipleEnvConfig)
+	defer home.Restore()
+	home.AddFiles(c, []testing.TestFile{{".juju/current-environment", "fubar"}})
 	context, err := testing.RunCommand(c, &SwitchCommand{}, nil)
 	c.Assert(err, gc.IsNil)
 	c.Assert(testing.Stdout(context), gc.Equals, "fubar\n")
 }
 
 func (*SwitchSimpleSuite) TestShowsJujuEnv(c *gc.C) {
-	testing.WriteEnvironments(c, testing.MultipleEnvConfig)
+	defer testing.MakeFakeHome(c, testing.MultipleEnvConfig).Restore()
 	os.Setenv("JUJU_ENV", "using-env")
 	context, err := testing.RunCommand(c, &SwitchCommand{}, nil)
 	c.Assert(err, gc.IsNil)
 	c.Assert(testing.Stdout(context), gc.Equals, "using-env\n")
 }
 
-func (s *SwitchSimpleSuite) TestJujuEnvOverCurrentEnvironment(c *gc.C) {
-	testing.WriteEnvironments(c, testing.MultipleEnvConfig)
-	s.FakeHomeSuite.Home.AddFiles(c, testing.TestFile{".juju/current-environment", "fubar"})
+func (*SwitchSimpleSuite) TestJujuEnvOverCurrentEnvironment(c *gc.C) {
+	home := testing.MakeFakeHome(c, testing.MultipleEnvConfig)
+	defer home.Restore()
+	home.AddFiles(c, []testing.TestFile{{".juju/current-environment", "fubar"}})
 	os.Setenv("JUJU_ENV", "using-env")
 	context, err := testing.RunCommand(c, &SwitchCommand{}, nil)
 	c.Assert(err, gc.IsNil)
@@ -66,7 +65,7 @@
 }
 
 func (*SwitchSimpleSuite) TestSettingWritesFile(c *gc.C) {
-	testing.WriteEnvironments(c, testing.MultipleEnvConfig)
+	defer testing.MakeFakeHome(c, testing.MultipleEnvConfig).Restore()
 	context, err := testing.RunCommand(c, &SwitchCommand{}, []string{"erewhemos-2"})
 	c.Assert(err, gc.IsNil)
 	c.Assert(testing.Stdout(context), gc.Equals, "erewhemos -> erewhemos-2\n")
@@ -74,13 +73,13 @@
 }
 
 func (*SwitchSimpleSuite) TestSettingToUnknown(c *gc.C) {
-	testing.WriteEnvironments(c, testing.MultipleEnvConfig)
+	defer testing.MakeFakeHome(c, testing.MultipleEnvConfig).Restore()
 	_, err := testing.RunCommand(c, &SwitchCommand{}, []string{"unknown"})
 	c.Assert(err, gc.ErrorMatches, `"unknown" is not a name of an existing defined environment`)
 }
 
 func (*SwitchSimpleSuite) TestSettingWhenJujuEnvSet(c *gc.C) {
-	testing.WriteEnvironments(c, testing.MultipleEnvConfig)
+	defer testing.MakeFakeHome(c, testing.MultipleEnvConfig).Restore()
 	os.Setenv("JUJU_ENV", "using-env")
 	_, err := testing.RunCommand(c, &SwitchCommand{}, []string{"erewhemos-2"})
 	c.Assert(err, gc.ErrorMatches, `cannot switch when JUJU_ENV is overriding the environment \(set to "using-env"\)`)
@@ -91,14 +90,14 @@
 `
 
 func (*SwitchSimpleSuite) TestListEnvironments(c *gc.C) {
-	testing.WriteEnvironments(c, testing.MultipleEnvConfig)
+	defer testing.MakeFakeHome(c, testing.MultipleEnvConfig).Restore()
 	context, err := testing.RunCommand(c, &SwitchCommand{}, []string{"--list"})
 	c.Assert(err, gc.IsNil)
 	c.Assert(testing.Stdout(context), gc.Equals, expectedEnvironments)
 }
 
 func (*SwitchSimpleSuite) TestListEnvironmentsOSJujuEnvSet(c *gc.C) {
-	testing.WriteEnvironments(c, testing.MultipleEnvConfig)
+	defer testing.MakeFakeHome(c, testing.MultipleEnvConfig).Restore()
 	os.Setenv("JUJU_ENV", "using-env")
 	context, err := testing.RunCommand(c, &SwitchCommand{}, []string{"--list"})
 	c.Assert(err, gc.IsNil)
@@ -106,13 +105,13 @@
 }
 
 func (*SwitchSimpleSuite) TestListEnvironmentsAndChange(c *gc.C) {
-	testing.WriteEnvironments(c, testing.MultipleEnvConfig)
+	defer testing.MakeFakeHome(c, testing.MultipleEnvConfig).Restore()
 	_, err := testing.RunCommand(c, &SwitchCommand{}, []string{"--list", "erewhemos-2"})
 	c.Assert(err, gc.ErrorMatches, "cannot switch and list at the same time")
 }
 
 func (*SwitchSimpleSuite) TestTooManyParams(c *gc.C) {
-	testing.WriteEnvironments(c, testing.MultipleEnvConfig)
+	defer testing.MakeFakeHome(c, testing.MultipleEnvConfig).Restore()
 	_, err := testing.RunCommand(c, &SwitchCommand{}, []string{"foo", "bar"})
 	c.Assert(err, gc.ErrorMatches, `unrecognized args: ."bar".`)
 }

=== modified file 'cmd/juju/synctools_test.go'
--- cmd/juju/synctools_test.go	2014-05-16 04:20:04 +0000
+++ cmd/juju/synctools_test.go	2014-05-22 14:33:28 +0000
@@ -18,10 +18,12 @@
 	"launchpad.net/juju-core/environs/sync"
 	"launchpad.net/juju-core/provider/dummy"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type syncToolsSuite struct {
-	coretesting.FakeJujuHomeSuite
+	testbase.LoggingSuite
+	home         *coretesting.FakeHome
 	configStore  configstore.Storage
 	localStorage string
 
@@ -31,10 +33,10 @@
 var _ = gc.Suite(&syncToolsSuite{})
 
 func (s *syncToolsSuite) SetUpTest(c *gc.C) {
-	s.FakeJujuHomeSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 
 	// Create a target environments.yaml and make sure its environment is empty.
-	coretesting.WriteEnvironments(c, `
+	s.home = coretesting.MakeFakeHome(c, `
 environments:
     test-target:
         type: dummy
@@ -50,7 +52,8 @@
 func (s *syncToolsSuite) TearDownTest(c *gc.C) {
 	syncTools = s.origSyncTools
 	dummy.Reset()
-	s.FakeJujuHomeSuite.TearDownTest(c)
+	s.home.Restore()
+	s.LoggingSuite.TearDownTest(c)
 }
 
 func (s *syncToolsSuite) Reset(c *gc.C) {

=== removed file 'cmd/juju/user.go'
--- cmd/juju/user.go	2014-05-20 04:27:21 +0000
+++ cmd/juju/user.go	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-// Copyright 2014 Canonical Ltd.
-// Licensed under the AGPLv3, see LICENCE file for details.
-
-package main
-
-import (
-	"launchpad.net/juju-core/cmd"
-	"launchpad.net/juju-core/cmd/envcmd"
-)
-
-type UserCommand struct {
-	*cmd.SuperCommand
-}
-
-const userCommandDoc = `
-"juju user" is used to manage the user accounts and access control in
-the Juju environment.
-`
-
-const userCommandPurpose = "manage user accounts and access control"
-
-func NewUserCommand() cmd.Command {
-	usercmd := &UserCommand{
-		SuperCommand: cmd.NewSuperCommand(cmd.SuperCommandParams{
-			Name:        "user",
-			Doc:         userCommandDoc,
-			UsagePrefix: "juju",
-			Purpose:     userCommandPurpose,
-		}),
-	}
-	// Define each subcommand in a separate "user_FOO.go" source file
-	// (with tests in user_FOO_test.go) and wire in here.
-	usercmd.Register(envcmd.Wrap(&UserAddCommand{}))
-	return usercmd
-}

=== removed file 'cmd/juju/user_test.go'
--- cmd/juju/user_test.go	2014-05-20 02:41:00 +0000
+++ cmd/juju/user_test.go	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-// Copyright 2014 Canonical Ltd.
-// Licensed under the AGPLv3, see LICENCE file for details.
-
-package main
-
-import (
-	"strings"
-
-	gc "launchpad.net/gocheck"
-	coretesting "launchpad.net/juju-core/testing"
-)
-
-type UserCommandSuite struct {
-	coretesting.BaseSuite
-}
-
-var _ = gc.Suite(&UserCommandSuite{})
-
-var expectedUserCommmandNames = []string{
-	"add",
-	"help",
-}
-
-func (s *UserCommandSuite) TestHelp(c *gc.C) {
-	// Check the help output
-	ctx, err := coretesting.RunCommand(c, NewUserCommand(), []string{"--help"})
-	c.Assert(err, gc.IsNil)
-	c.Assert(coretesting.Stdout(ctx), gc.Matches,
-		"(?s)usage: user <command> .+"+
-			userCommandPurpose+".+"+
-			userCommandDoc+".+")
-
-	// Check that we have registered all the sub commands by
-	// inspecting the help output.
-	var namesFound []string
-	commandHelp := strings.SplitAfter(coretesting.Stdout(ctx), "commands:")[1]
-	commandHelp = strings.TrimSpace(commandHelp)
-	for _, line := range strings.Split(commandHelp, "\n") {
-		namesFound = append(namesFound, strings.TrimSpace(strings.Split(line, " - ")[0]))
-	}
-	c.Assert(namesFound, gc.DeepEquals, expectedUserCommmandNames)
-}

=== modified file 'cmd/jujud/agent_test.go'
--- cmd/jujud/agent_test.go	2014-05-20 04:27:02 +0000
+++ cmd/jujud/agent_test.go	2014-05-22 14:33:28 +0000
@@ -25,6 +25,7 @@
 	"launchpad.net/juju-core/state/api"
 	"launchpad.net/juju-core/state/api/params"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 	"launchpad.net/juju-core/worker"
@@ -34,7 +35,7 @@
 var _ = gc.Suite(&toolSuite{})
 
 type toolSuite struct {
-	coretesting.BaseSuite
+	testbase.LoggingSuite
 }
 
 var errorImportanceTests = []error{
@@ -89,7 +90,7 @@
 }
 
 type apiOpenSuite struct {
-	coretesting.BaseSuite
+	testbase.LoggingSuite
 }
 
 type fakeAPIOpenConfig struct {

=== modified file 'cmd/jujud/bootstrap_test.go'
--- cmd/jujud/bootstrap_test.go	2014-05-20 04:27:02 +0000
+++ cmd/jujud/bootstrap_test.go	2014-05-22 14:33:28 +0000
@@ -27,6 +27,7 @@
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"
 	"launchpad.net/juju-core/worker/peergrouper"
@@ -37,7 +38,7 @@
 // We don't want to use JujuConnSuite because it gives us
 // an already-bootstrapped environment.
 type BootstrapSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 	testing.MgoSuite
 	envcfg          string
 	instanceId      instance.Id
@@ -76,19 +77,19 @@
 	s.PatchValue(&ensureMongoServer, s.fakeEnsureMongo.fakeEnsureMongo)
 	s.PatchValue(&maybeInitiateMongoServer, s.fakeEnsureMongo.fakeInitiateMongo)
 
-	s.BaseSuite.SetUpSuite(c)
+	s.LoggingSuite.SetUpSuite(c)
 	s.MgoSuite.SetUpSuite(c)
 	s.makeTestEnv(c)
 }
 
 func (s *BootstrapSuite) TearDownSuite(c *gc.C) {
 	s.MgoSuite.TearDownSuite(c)
-	s.BaseSuite.TearDownSuite(c)
+	s.LoggingSuite.TearDownSuite(c)
 	dummy.Reset()
 }
 
 func (s *BootstrapSuite) SetUpTest(c *gc.C) {
-	s.BaseSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	s.MgoSuite.SetUpTest(c)
 	s.dataDir = c.MkDir()
 	s.logDir = c.MkDir()
@@ -97,7 +98,7 @@
 
 func (s *BootstrapSuite) TearDownTest(c *gc.C) {
 	s.MgoSuite.TearDownTest(c)
-	s.BaseSuite.TearDownTest(c)
+	s.LoggingSuite.TearDownTest(c)
 }
 
 var testPassword = "my-admin-secret"

=== modified file 'cmd/jujud/machine.go'
--- cmd/jujud/machine.go	2014-05-19 12:59:11 +0000
+++ cmd/jujud/machine.go	2014-05-22 14:33:28 +0000
@@ -450,11 +450,9 @@
 			a.startWorkerAfterUpgrade(runner, "instancepoller", func() (worker.Worker, error) {
 				return instancepoller.NewWorker(st), nil
 			})
-			if shouldEnableHA(agentConfig) {
-				a.startWorkerAfterUpgrade(runner, "peergrouper", func() (worker.Worker, error) {
-					return peergrouperNew(st)
-				})
-			}
+			runner.StartWorker("peergrouper", func() (worker.Worker, error) {
+				return peergrouperNew(st)
+			})
 			runner.StartWorker("apiserver", func() (worker.Worker, error) {
 				// If the configuration does not have the required information,
 				// it is currently not a recoverable error, so we kill the whole

=== modified file 'cmd/jujud/machine_test.go'
--- cmd/jujud/machine_test.go	2014-05-19 13:07:51 +0000
+++ cmd/jujud/machine_test.go	2014-05-22 14:33:28 +0000
@@ -13,6 +13,7 @@
 	"time"
 
 	"github.com/juju/errors"
+	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
@@ -64,7 +65,8 @@
 func (s *commonMachineSuite) SetUpSuite(c *gc.C) {
 	s.agentSuite.SetUpSuite(c)
 	s.TestSuite.SetUpSuite(c)
-	s.agentSuite.PatchValue(&charm.CacheDir, c.MkDir())
+	restore := testing.PatchValue(&charm.CacheDir, c.MkDir())
+	s.AddSuiteCleanup(func(*gc.C) { restore() })
 }
 
 func (s *commonMachineSuite) TearDownSuite(c *gc.C) {
@@ -77,26 +79,28 @@
 	s.TestSuite.SetUpTest(c)
 
 	os.Remove(jujuRun) // ignore error; may not exist
-	// Patch ssh user to avoid touching ~ubuntu/.ssh/authorized_keys.
-	s.agentSuite.PatchValue(&authenticationworker.SSHUser, "")
+	// Fake $HOME, and ssh user to avoid touching ~ubuntu/.ssh/authorized_keys.
+	fakeHome := coretesting.MakeEmptyFakeHomeWithoutJuju(c)
+	s.AddCleanup(func(*gc.C) { fakeHome.Restore() })
+	s.PatchValue(&authenticationworker.SSHUser, "")
 
 	testpath := c.MkDir()
-	s.agentSuite.PatchEnvPathPrepend(testpath)
+	s.PatchEnvPathPrepend(testpath)
 	// mock out the start method so we can fake install services without sudo
 	fakeCmd(filepath.Join(testpath, "start"))
 	fakeCmd(filepath.Join(testpath, "stop"))
 
-	s.agentSuite.PatchValue(&upstart.InitDir, c.MkDir())
+	s.PatchValue(&upstart.InitDir, c.MkDir())
 
 	s.singularRecord = &singularRunnerRecord{}
-	s.agentSuite.PatchValue(&newSingularRunner, s.singularRecord.newSingularRunner)
-	s.agentSuite.PatchValue(&peergrouperNew, func(st *state.State) (worker.Worker, error) {
+	testing.PatchValue(&newSingularRunner, s.singularRecord.newSingularRunner)
+	testing.PatchValue(&peergrouperNew, func(st *state.State) (worker.Worker, error) {
 		return newDummyWorker(), nil
 	})
 
 	s.fakeEnsureMongo = fakeEnsure{}
-	s.agentSuite.PatchValue(&ensureMongoServer, s.fakeEnsureMongo.fakeEnsureMongo)
-	s.agentSuite.PatchValue(&maybeInitiateMongoServer, s.fakeEnsureMongo.fakeInitiateMongo)
+	s.PatchValue(&ensureMongoServer, s.fakeEnsureMongo.fakeEnsureMongo)
+	s.PatchValue(&maybeInitiateMongoServer, s.fakeEnsureMongo.fakeInitiateMongo)
 }
 
 func fakeCmd(path string) {
@@ -404,7 +408,7 @@
 }
 
 func (s *MachineSuite) TestManageEnvironRunsInstancePoller(c *gc.C) {
-	s.agentSuite.PatchValue(&instancepoller.ShortPoll, 500*time.Millisecond)
+	s.PatchValue(&instancepoller.ShortPoll, 500*time.Millisecond)
 	usefulVersion := version.Current
 	usefulVersion.Series = "quantal" // to match the charm created below
 	envtesting.AssertUploadFakeToolsVersions(c, s.Conn.Environ.Storage(), usefulVersion)
@@ -445,7 +449,7 @@
 
 func (s *MachineSuite) TestManageEnvironRunsPeergrouper(c *gc.C) {
 	started := make(chan struct{}, 1)
-	s.agentSuite.PatchValue(&peergrouperNew, func(st *state.State) (worker.Worker, error) {
+	testing.PatchValue(&peergrouperNew, func(st *state.State) (worker.Worker, error) {
 		c.Check(st, gc.NotNil)
 		select {
 		case started <- struct{}{}:
@@ -466,33 +470,6 @@
 	}
 }
 
-func (s *MachineSuite) TestEnsureLocalEnvironDoesntRunPeergrouper(c *gc.C) {
-	started := make(chan struct{}, 1)
-	s.agentSuite.PatchValue(&peergrouperNew, func(st *state.State) (worker.Worker, error) {
-		c.Check(st, gc.NotNil)
-		select {
-		case started <- struct{}{}:
-		default:
-		}
-		return newDummyWorker(), nil
-	})
-	m, _, _ := s.primeAgent(c, version.Current, state.JobManageEnviron)
-	a := s.newAgent(c, m)
-	err := a.ChangeConfig(func(config agent.ConfigSetter) {
-		config.SetValue(agent.ProviderType, "local")
-	})
-	c.Assert(err, gc.IsNil)
-	defer func() { c.Check(a.Stop(), gc.IsNil) }()
-	go func() {
-		c.Check(a.Run(nil), gc.IsNil)
-	}()
-	select {
-	case <-started:
-		c.Fatalf("local environment should not start peergrouper")
-	case <-time.After(coretesting.ShortWait):
-	}
-}
-
 func (s *MachineSuite) TestManageEnvironCallsUseMultipleCPUs(c *gc.C) {
 	// If it has been enabled, the JobManageEnviron agent should call utils.UseMultipleCPUs
 	usefulVersion := version.Current
@@ -500,7 +477,7 @@
 	envtesting.AssertUploadFakeToolsVersions(c, s.Conn.Environ.Storage(), usefulVersion)
 	m, _, _ := s.primeAgent(c, version.Current, state.JobManageEnviron)
 	calledChan := make(chan struct{}, 1)
-	s.agentSuite.PatchValue(&useMultipleCPUs, func() { calledChan <- struct{}{} })
+	s.PatchValue(&useMultipleCPUs, func() { calledChan <- struct{}{} })
 	// Now, start the agent, and observe that a JobManageEnviron agent
 	// calls UseMultipleCPUs
 	a := s.newAgent(c, m)
@@ -653,7 +630,7 @@
 	// need to check for that here, like in assertJobWithState.
 
 	agentAPIs := make(chan eitherState, 1)
-	s.agentSuite.PatchValue(reportOpened, func(st eitherState) {
+	s.PatchValue(reportOpened, func(st eitherState) {
 		select {
 		case agentAPIs <- st:
 		default:
@@ -853,8 +830,8 @@
 
 func (s *MachineSuite) TestMachineEnvironWorker(c *gc.C) {
 	proxyDir := c.MkDir()
-	s.agentSuite.PatchValue(&machineenvironmentworker.ProxyDirectory, proxyDir)
-	s.agentSuite.PatchValue(&utils.AptConfFile, filepath.Join(proxyDir, "juju-apt-proxy"))
+	s.PatchValue(&machineenvironmentworker.ProxyDirectory, proxyDir)
+	s.PatchValue(&utils.AptConfFile, filepath.Join(proxyDir, "juju-apt-proxy"))
 
 	s.primeAgent(c, version.Current, state.JobHostUnits)
 	// Make sure there are some proxy settings to write.
@@ -911,7 +888,7 @@
 
 func (s *MachineSuite) testMachineAgentRsyslogConfigWorker(c *gc.C, job state.MachineJob, expectedMode rsyslog.RsyslogMode) {
 	created := make(chan rsyslog.RsyslogMode, 1)
-	s.agentSuite.PatchValue(&newRsyslogConfigWorker, func(_ *apirsyslog.State, _ agent.Config, mode rsyslog.RsyslogMode) (worker.Worker, error) {
+	s.PatchValue(&newRsyslogConfigWorker, func(_ *apirsyslog.State, _ agent.Config, mode rsyslog.RsyslogMode) (worker.Worker, error) {
 		created <- mode
 		return newDummyWorker(), nil
 	})
@@ -959,14 +936,14 @@
 	err = s.State.MongoSession().DB("admin").RemoveUser(m.Tag())
 	c.Assert(err, gc.IsNil)
 
-	s.agentSuite.PatchValue(&ensureMongoAdminUser, func(p mongo.EnsureAdminUserParams) (bool, error) {
+	s.PatchValue(&ensureMongoAdminUser, func(p mongo.EnsureAdminUserParams) (bool, error) {
 		err := s.State.MongoSession().DB("admin").AddUser(p.User, p.Password, false)
 		c.Assert(err, gc.IsNil)
 		return true, nil
 	})
 
 	stateOpened := make(chan eitherState, 1)
-	s.agentSuite.PatchValue(&reportOpenedState, func(st eitherState) {
+	s.PatchValue(&reportOpenedState, func(st eitherState) {
 		select {
 		case stateOpened <- st:
 		default:

=== modified file 'cmd/jujud/run_test.go'
--- cmd/jujud/run_test.go	2014-05-20 04:27:02 +0000
+++ cmd/jujud/run_test.go	2014-05-22 14:33:28 +0000
@@ -15,13 +15,14 @@
 
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils/exec"
 	"launchpad.net/juju-core/utils/fslock"
 	"launchpad.net/juju-core/worker/uniter"
 )
 
 type RunTestSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&RunTestSuite{})

=== modified file 'cmd/jujud/upgrade_test.go'
--- cmd/jujud/upgrade_test.go	2014-05-16 04:20:04 +0000
+++ cmd/jujud/upgrade_test.go	2014-05-22 14:33:28 +0000
@@ -36,7 +36,7 @@
 
 	// Capture all apt commands.
 	s.aptCmds = nil
-	aptCmds := s.agentSuite.HookCommandOutput(&utils.AptCommandOutput, nil, nil)
+	aptCmds := s.HookCommandOutput(&utils.AptCommandOutput, nil, nil)
 	go func() {
 		for cmd := range aptCmds {
 			s.aptCmds = append(s.aptCmds, cmd)
@@ -65,7 +65,7 @@
 }
 
 func (s *UpgradeSuite) assertUpgradeSteps(c *gc.C, job state.MachineJob) {
-	s.agentSuite.PatchValue(&version.Current, s.upgradeToVersion)
+	s.PatchValue(&version.Current, s.upgradeToVersion)
 	err := s.State.SetEnvironAgentVersion(s.upgradeToVersion.Number)
 	c.Assert(err, gc.IsNil)
 

=== modified file 'cmd/plugins/juju-metadata/imagemetadata_test.go'
--- cmd/plugins/juju-metadata/imagemetadata_test.go	2014-05-16 01:33:13 +0000
+++ cmd/plugins/juju-metadata/imagemetadata_test.go	2014-05-22 14:33:28 +0000
@@ -19,23 +19,26 @@
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/provider/dummy"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type ImageMetadataSuite struct {
-	testing.FakeJujuHomeSuite
+	testbase.LoggingSuite
 	environ []string
+	home    *testing.FakeHome
 	dir     string
 }
 
 var _ = gc.Suite(&ImageMetadataSuite{})
 
 func (s *ImageMetadataSuite) SetUpSuite(c *gc.C) {
-	s.FakeJujuHomeSuite.SetUpSuite(c)
+	s.LoggingSuite.SetUpSuite(c)
 	s.environ = os.Environ()
 }
 
 func (s *ImageMetadataSuite) SetUpTest(c *gc.C) {
-	s.FakeJujuHomeSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
+	os.Clearenv()
 	s.dir = c.MkDir()
 	// Create a fake certificate so azure test environment can be opened.
 	certfile, err := ioutil.TempFile(s.dir, "")
@@ -44,11 +47,20 @@
 	err = ioutil.WriteFile(filename, []byte("test certificate"), 0644)
 	c.Assert(err, gc.IsNil)
 	envConfig := strings.Replace(metadataTestEnvConfig, "/home/me/azure.pem", filename, -1)
-	testing.WriteEnvironments(c, envConfig)
+	s.home = testing.MakeFakeHome(c, envConfig)
 	s.PatchEnvironment("AWS_ACCESS_KEY_ID", "access")
 	s.PatchEnvironment("AWS_SECRET_ACCESS_KEY", "secret")
 }
 
+func (s *ImageMetadataSuite) TearDownTest(c *gc.C) {
+	for _, envstring := range s.environ {
+		kv := strings.SplitN(envstring, "=", 2)
+		os.Setenv(kv[0], kv[1])
+	}
+	s.home.Restore()
+	s.LoggingSuite.TearDownTest(c)
+}
+
 var seriesVersions map[string]string = map[string]string{
 	"precise": "12.04",
 	"raring":  "13.04",
@@ -131,8 +143,6 @@
 }
 
 func (s *ImageMetadataSuite) TestImageMetadataFilesLatestLts(c *gc.C) {
-	envConfig := strings.Replace(metadataTestEnvConfig, "default-series: precise", "", -1)
-	testing.WriteEnvironments(c, envConfig)
 	ctx := testing.Context(c)
 	code := cmd.Main(
 		envcmd.Wrap(&ImageMetadataCommand{}), ctx, []string{
@@ -217,8 +227,9 @@
 }
 
 func (s *ImageMetadataSuite) TestImageMetadataBadArgs(c *gc.C) {
-	testing.MakeSampleJujuHome(c)
+	home := testing.MakeSampleHome(c)
 	s.AddCleanup(func(*gc.C) {
+		home.Restore()
 		dummy.Reset()
 	})
 	for i, t := range errTests {

=== modified file 'cmd/plugins/juju-metadata/metadataplugin_test.go'
--- cmd/plugins/juju-metadata/metadataplugin_test.go	2014-05-16 01:33:13 +0000
+++ cmd/plugins/juju-metadata/metadataplugin_test.go	2014-05-22 14:33:28 +0000
@@ -22,7 +22,7 @@
 }
 
 type MetadataSuite struct {
-	testing.FakeJujuHomeSuite
+	jujuHome *testing.FakeHome
 }
 
 var _ = gc.Suite(&MetadataSuite{})
@@ -36,6 +36,14 @@
 	"validate-tools",
 }
 
+func (s *MetadataSuite) SetUpTest(c *gc.C) {
+	s.jujuHome = testing.MakeEmptyFakeHome(c)
+}
+
+func (s *MetadataSuite) TearDownTest(c *gc.C) {
+	s.jujuHome.Restore()
+}
+
 var (
 	flagRunMain = flag.Bool("run-main", false, "Run the application's main function for recursive testing")
 )

=== modified file 'cmd/plugins/juju-metadata/toolsmetadata_test.go'
--- cmd/plugins/juju-metadata/toolsmetadata_test.go	2014-05-19 04:28:01 +0000
+++ cmd/plugins/juju-metadata/toolsmetadata_test.go	2014-05-22 14:33:28 +0000
@@ -23,11 +23,13 @@
 	"launchpad.net/juju-core/juju/osenv"
 	"launchpad.net/juju-core/provider/dummy"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/version"
 )
 
 type ToolsMetadataSuite struct {
-	coretesting.FakeJujuHomeSuite
+	testbase.LoggingSuite
+	home             *coretesting.FakeHome
 	env              environs.Environ
 	publicStorageDir string
 }
@@ -35,8 +37,10 @@
 var _ = gc.Suite(&ToolsMetadataSuite{})
 
 func (s *ToolsMetadataSuite) SetUpTest(c *gc.C) {
-	s.FakeJujuHomeSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
+	s.home = coretesting.MakeSampleHome(c)
 	s.AddCleanup(func(*gc.C) {
+		s.home.Restore()
 		dummy.Reset()
 		loggo.ResetLoggers()
 	})

=== modified file 'cmd/plugins/juju-metadata/validateimagemetadata_test.go'
--- cmd/plugins/juju-metadata/validateimagemetadata_test.go	2014-05-16 01:33:13 +0000
+++ cmd/plugins/juju-metadata/validateimagemetadata_test.go	2014-05-22 14:33:28 +0000
@@ -16,10 +16,12 @@
 	"launchpad.net/juju-core/environs/imagemetadata"
 	"launchpad.net/juju-core/environs/simplestreams"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type ValidateImageMetadataSuite struct {
-	coretesting.FakeJujuHomeSuite
+	testbase.LoggingSuite
+	home        *coretesting.FakeHome
 	metadataDir string
 }
 
@@ -104,13 +106,18 @@
 `
 
 func (s *ValidateImageMetadataSuite) SetUpTest(c *gc.C) {
-	s.FakeJujuHomeSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	s.metadataDir = c.MkDir()
-	coretesting.WriteEnvironments(c, metadataTestEnvConfig)
+	s.home = coretesting.MakeFakeHome(c, metadataTestEnvConfig)
 	s.PatchEnvironment("AWS_ACCESS_KEY_ID", "access")
 	s.PatchEnvironment("AWS_SECRET_ACCESS_KEY", "secret")
 }
 
+func (s *ValidateImageMetadataSuite) TearDownTest(c *gc.C) {
+	s.home.Restore()
+	s.LoggingSuite.TearDownTest(c)
+}
+
 func (s *ValidateImageMetadataSuite) setupEc2LocalMetadata(c *gc.C, region, stream string) {
 	ec2Region, ok := aws.Regions[region]
 	if !ok {

=== modified file 'cmd/plugins/juju-metadata/validatetoolsmetadata_test.go'
--- cmd/plugins/juju-metadata/validatetoolsmetadata_test.go	2014-05-16 01:33:13 +0000
+++ cmd/plugins/juju-metadata/validatetoolsmetadata_test.go	2014-05-22 14:33:28 +0000
@@ -15,11 +15,13 @@
 	"launchpad.net/juju-core/environs/filestorage"
 	"launchpad.net/juju-core/environs/tools"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/version"
 )
 
 type ValidateToolsMetadataSuite struct {
-	coretesting.FakeJujuHomeSuite
+	testbase.LoggingSuite
+	home        *coretesting.FakeHome
 	metadataDir string
 }
 
@@ -86,13 +88,18 @@
 }
 
 func (s *ValidateToolsMetadataSuite) SetUpTest(c *gc.C) {
-	s.FakeJujuHomeSuite.SetUpTest(c)
-	coretesting.WriteEnvironments(c, metadataTestEnvConfig)
+	s.LoggingSuite.SetUpTest(c)
+	s.home = coretesting.MakeFakeHome(c, metadataTestEnvConfig)
 	s.metadataDir = c.MkDir()
 	s.PatchEnvironment("AWS_ACCESS_KEY_ID", "access")
 	s.PatchEnvironment("AWS_SECRET_ACCESS_KEY", "secret")
 }
 
+func (s *ValidateToolsMetadataSuite) TearDownTest(c *gc.C) {
+	s.home.Restore()
+	s.LoggingSuite.TearDownTest(c)
+}
+
 func (s *ValidateToolsMetadataSuite) setupEc2LocalMetadata(c *gc.C, region string) {
 	ec2Region, ok := aws.Regions[region]
 	if !ok {

=== modified file 'cmd/plugins/local/main_test.go'
--- cmd/plugins/local/main_test.go	2014-05-20 04:27:02 +0000
+++ cmd/plugins/local/main_test.go	2014-05-22 14:33:28 +0000
@@ -15,10 +15,11 @@
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/cmd/plugins/local"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type mainSuite struct {
-	coretesting.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&mainSuite{})

=== modified file 'constraints/validation_test.go'
--- constraints/validation_test.go	2014-05-20 05:33:59 +0000
+++ constraints/validation_test.go	2014-05-22 14:33:28 +0000
@@ -126,7 +126,7 @@
 		unsupported, err := validator.Validate(cons)
 		if t.err == "" {
 			c.Assert(err, gc.IsNil)
-			c.Assert(unsupported, jc.SameContents, t.unsupported)
+			c.Assert(unsupported, jc.DeepEquals, t.unsupported)
 		} else {
 			c.Assert(err, gc.ErrorMatches, t.err)
 		}

=== modified file 'container/directory_test.go'
--- container/directory_test.go	2014-05-20 04:27:02 +0000
+++ container/directory_test.go	2014-05-22 14:33:28 +0000
@@ -11,11 +11,11 @@
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/container"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type DirectorySuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 	containerDir string
 	removedDir   string
 }
@@ -23,7 +23,7 @@
 var _ = gc.Suite(&DirectorySuite{})
 
 func (s *DirectorySuite) SetUpTest(c *gc.C) {
-	s.BaseSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	s.containerDir = c.MkDir()
 	s.PatchValue(&container.ContainerDir, s.containerDir)
 	s.removedDir = c.MkDir()

=== modified file 'container/factory/factory_test.go'
--- container/factory/factory_test.go	2014-05-20 04:27:02 +0000
+++ container/factory/factory_test.go	2014-05-22 14:33:28 +0000
@@ -9,11 +9,11 @@
 	"launchpad.net/juju-core/container"
 	"launchpad.net/juju-core/container/factory"
 	"launchpad.net/juju-core/instance"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type factorySuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&factorySuite{})

=== modified file 'container/kvm/kvm_test.go'
--- container/kvm/kvm_test.go	2014-05-20 04:27:02 +0000
+++ container/kvm/kvm_test.go	2014-05-22 14:33:28 +0000
@@ -16,7 +16,7 @@
 	kvmtesting "launchpad.net/juju-core/container/kvm/testing"
 	containertesting "launchpad.net/juju-core/container/testing"
 	"launchpad.net/juju-core/instance"
-	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/version"
 )
 
@@ -109,7 +109,7 @@
 }
 
 type ConstraintsSuite struct {
-	coretesting.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&ConstraintsSuite{})

=== modified file 'container/kvm/live_test.go'
--- container/kvm/live_test.go	2014-05-20 04:27:02 +0000
+++ container/kvm/live_test.go	2014-05-22 14:33:28 +0000
@@ -19,12 +19,13 @@
 	"launchpad.net/juju-core/instance"
 	jujutesting "launchpad.net/juju-core/juju/testing"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
 
 type LiveSuite struct {
-	coretesting.BaseSuite
+	testbase.LoggingSuite
 	ContainerDir string
 	RemovedDir   string
 }
@@ -32,7 +33,7 @@
 var _ = gc.Suite(&LiveSuite{})
 
 func (s *LiveSuite) SetUpTest(c *gc.C) {
-	s.BaseSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	// Skip if not linux
 	if runtime.GOOS != "linux" {
 		c.Skip("not running linux")

=== modified file 'container/kvm/mock/mock-kvm_test.go'
--- container/kvm/mock/mock-kvm_test.go	2014-05-20 04:27:02 +0000
+++ container/kvm/mock/mock-kvm_test.go	2014-05-22 14:33:28 +0000
@@ -9,11 +9,11 @@
 
 	"launchpad.net/juju-core/container/kvm"
 	"launchpad.net/juju-core/container/kvm/mock"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type MockSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&MockSuite{})

=== modified file 'container/kvm/testing/test.go'
--- container/kvm/testing/test.go	2014-05-20 04:27:02 +0000
+++ container/kvm/testing/test.go	2014-05-22 14:33:28 +0000
@@ -13,20 +13,20 @@
 	"launchpad.net/juju-core/container"
 	"launchpad.net/juju-core/container/kvm"
 	"launchpad.net/juju-core/container/kvm/mock"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 // TestSuite replaces the kvm factory that the manager uses with a mock
 // implementation.
 type TestSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 	Factory      mock.ContainerFactory
 	ContainerDir string
 	RemovedDir   string
 }
 
 func (s *TestSuite) SetUpTest(c *gc.C) {
-	s.BaseSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	s.ContainerDir = c.MkDir()
 	s.PatchValue(&container.ContainerDir, s.ContainerDir)
 	s.RemovedDir = c.MkDir()

=== modified file 'container/lxc/export_test.go'
--- container/lxc/export_test.go	2014-05-13 12:57:53 +0000
+++ container/lxc/export_test.go	2014-05-22 14:33:28 +0000
@@ -3,18 +3,10 @@
 
 package lxc
 
-import "launchpad.net/juju-core/container"
-
 var (
 	ContainerConfigFilename = containerConfigFilename
 	ContainerDirFilesystem  = containerDirFilesystem
 	GenerateNetworkConfig   = generateNetworkConfig
 	NetworkConfigTemplate   = networkConfigTemplate
 	RestartSymlink          = restartSymlink
-	ReleaseVersion          = &releaseVersion
-	PreferFastLXC           = preferFastLXC
 )
-
-func GetCreateWithCloneValue(mgr container.Manager) bool {
-	return mgr.(*containerManager).createWithClone
-}

=== modified file 'container/lxc/initialisation_test.go'
--- container/lxc/initialisation_test.go	2014-05-20 04:27:02 +0000
+++ container/lxc/initialisation_test.go	2014-05-22 14:33:28 +0000
@@ -6,12 +6,12 @@
 import (
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils"
 )
 
 type InitialiserSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&InitialiserSuite{})

=== modified file 'container/lxc/lxc.go'
--- container/lxc/lxc.go	2014-05-15 10:31:08 +0000
+++ container/lxc/lxc.go	2014-05-22 14:33:28 +0000
@@ -88,19 +88,10 @@
 	if logDir == "" {
 		logDir = agent.DefaultLogDir
 	}
-	var useClone bool
-	useCloneVal := conf.PopValue("use-clone")
-	if useCloneVal != "" {
-		// Explicitly ignore the error result from ParseBool.
-		// If it fails to parse, the value is false, and this suits
-		// us fine.
-		useClone, _ = strconv.ParseBool(useCloneVal)
-	} else {
-		// If no lxc-clone value is explicitly set in config, then
-		// see if the Ubuntu series we are running on supports it
-		// and if it does, we will use clone.
-		useClone = preferFastLXC(releaseVersion())
-	}
+	// Explicitly ignore the error result from ParseBool.
+	// If it fails to parse, the value is false, and this suits
+	// us fine.
+	useClone, _ := strconv.ParseBool(conf.PopValue("use-clone"))
 	useAUFS, _ := strconv.ParseBool(conf.PopValue("use-aufs"))
 	backingFS, err := containerDirFilesystem()
 	if err != nil {
@@ -121,23 +112,6 @@
 	}, nil
 }
 
-// releaseVersion is a function that returns a string representing the
-// DISTRIB_RELEASE from the /etc/lsb-release file.
-var releaseVersion = version.ReleaseVersion
-
-// preferFastLXC returns true if the host is capable of
-// LXC cloning from a template.
-func preferFastLXC(release string) bool {
-	if release == "" {
-		return false
-	}
-	value, err := strconv.ParseFloat(release, 64)
-	if err != nil {
-		return false
-	}
-	return value >= 14.04
-}
-
 func (manager *containerManager) CreateContainer(
 	machineConfig *cloudinit.MachineConfig,
 	series string,

=== modified file 'container/lxc/lxc_test.go'
--- container/lxc/lxc_test.go	2014-05-20 04:27:02 +0000
+++ container/lxc/lxc_test.go	2014-05-22 14:33:28 +0000
@@ -26,7 +26,7 @@
 	containertesting "launchpad.net/juju-core/container/testing"
 	instancetest "launchpad.net/juju-core/instance/testing"
 	"launchpad.net/juju-core/juju/osenv"
-	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 func Test(t *stdtesting.T) {
@@ -58,68 +58,6 @@
 	s.TestSuite.TearDownTest(c)
 }
 
-func (t *LxcSuite) TestPreferFastLXC(c *gc.C) {
-	for i, test := range []struct {
-		message        string
-		releaseVersion string
-		expected       bool
-	}{{
-		message: "missing release file",
-	}, {
-		message:        "precise release",
-		releaseVersion: "12.04",
-	}, {
-		message:        "trusty release",
-		releaseVersion: "14.04",
-		expected:       true,
-	}, {
-		message:        "unstable unicorn",
-		releaseVersion: "14.10",
-		expected:       true,
-	}, {
-		message:        "lucid",
-		releaseVersion: "10.04",
-	}} {
-		c.Logf("%v: %v", i, test.message)
-		value := lxc.PreferFastLXC(test.releaseVersion)
-		c.Assert(value, gc.Equals, test.expected)
-	}
-}
-
-func (s *LxcSuite) TestContainerManagerLXCClone(c *gc.C) {
-	type test struct {
-		releaseVersion string
-		useClone       string
-		expectClone    bool
-	}
-	tests := []test{{
-		releaseVersion: "12.04",
-		useClone:       "true",
-		expectClone:    true,
-	}, {
-		releaseVersion: "14.04",
-		expectClone:    true,
-	}, {
-		releaseVersion: "12.04",
-		useClone:       "false",
-	}, {
-		releaseVersion: "14.04",
-		useClone:       "false",
-	}}
-
-	for i, test := range tests {
-		c.Logf("test %d: %v", i, test)
-		s.PatchValue(lxc.ReleaseVersion, func() string { return test.releaseVersion })
-
-		mgr, err := lxc.NewContainerManager(container.ManagerConfig{
-			container.ConfigName: "juju",
-			"use-clone":          test.useClone,
-		})
-		c.Assert(err, gc.IsNil)
-		c.Check(lxc.GetCreateWithCloneValue(mgr), gc.Equals, test.expectClone)
-	}
-}
-
 func (s *LxcSuite) TestContainerDirFilesystem(c *gc.C) {
 	for i, test := range []struct {
 		message    string
@@ -155,9 +93,9 @@
 	params := container.ManagerConfig{
 		container.ConfigName: name,
 	}
-	// Need to ensure use-clone is explicitly set to avoid it
-	// being set based on the OS version.
-	params["use-clone"] = fmt.Sprintf("%v", s.useClone)
+	if s.useClone {
+		params["use-clone"] = "true"
+	}
 	if s.useAUFS {
 		params["use-aufs"] = "true"
 	}
@@ -447,7 +385,7 @@
 }
 
 type NetworkSuite struct {
-	coretesting.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&NetworkSuite{})

=== modified file 'container/lxc/testing/test.go'
--- container/lxc/testing/test.go	2014-05-16 01:33:13 +0000
+++ container/lxc/testing/test.go	2014-05-22 14:33:28 +0000
@@ -9,13 +9,13 @@
 	"launchpad.net/juju-core/container"
 	"launchpad.net/juju-core/container/lxc"
 	"launchpad.net/juju-core/container/lxc/mock"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 // TestSuite replaces the lxc factory that the broker uses with a mock
 // implementation.
 type TestSuite struct {
-	testing.FakeJujuHomeSuite
+	testbase.LoggingSuite
 	Factory      mock.ContainerFactory
 	ContainerDir string
 	RemovedDir   string
@@ -24,7 +24,7 @@
 }
 
 func (s *TestSuite) SetUpTest(c *gc.C) {
-	s.FakeJujuHomeSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	s.ContainerDir = c.MkDir()
 	s.PatchValue(&container.ContainerDir, s.ContainerDir)
 	s.RemovedDir = c.MkDir()

=== removed file 'doc.go'
--- doc.go	2014-05-20 01:56:13 +0000
+++ doc.go	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-// Copyright 2013 Canonical Ltd.
-// Licensed under the AGPLv3, see LICENCE file for details.
-
-// Juju is devops distilled.
-//
-// Project homepage: https://launchpad.net/juju-core
-//
-// For more information please refer to the README file
-// in this directory.
-package juju

=== modified file 'doc/how-to-write-tests.txt'
--- doc/how-to-write-tests.txt	2014-05-16 01:33:13 +0000
+++ doc/how-to-write-tests.txt	2014-05-22 14:33:28 +0000
@@ -140,28 +140,23 @@
 set-up and tear-down logic.  Suites are often composed of other suites
 that provide specific set-up and tear-down behaviour.
 
-There are four main suites:
+There are three main suites:
 
-  * /testing.BaseSuite (testing/base.go)
+  * /testing/testbase.LoggingSuite (testing/testbase/log.go)
   * /testing.FakeHomeSuite (testing/environ.go)
-  * /testing.FakeJujuHomeSuite (testing/environ.go)
   * /juju/testing.JujuConnSuite (juju/testing/conn.go)
 
-The last three have the BaseSuite functionality included through
-composition.  The BaseSuite isolates a user's home directory from accidental
-modification (by setting $HOME to "") and errors if there is an attempt to do
-outgoing http access. It also clears the relevant $JUJU_* environment variables.
-The BaseSuite is also composed of the core LoggingSuite, and also LoggingSuite
-from  github.com/juju/testing, which brings in the CleanupSuite from the same.
-The CleanupSuite has the functionality around patching environment variables
-and normal variables for the duration of a test. It also provides a clean-up
-stack that gets called when the test teardown happens.
-
-All test suites should embedd BaseSuite. Those that need the extra functionality
-can instead embedd one of the fake home suites:
-
-* FakeHomeSuite: creates a fake home directory with ~/.ssh and fake ssh keys.
-* FakeJujuHomeSuite: as above but also sets up a ~/.juju with a fake environment.
+The second two have the LoggingSuite functionality included through
+composition.  The LoggingSuite is also composed of the LoggingSuite from 
+github.com/juju/testing, which brings in the CleanupSuite from the same.
+The CleanupSuite has the functionality around patching environment
+variables and normal variables for the duration of a test. It also
+provides a clean-up stack that gets called when the test teardown happens.
+
+The FakeHomeSuite creates a temporary directory and sets the HOME environment
+variable to it. It also creates ~/.juju and a simple environments.yaml file,
+~/.ssh with a fake id_rsa.pub key, it isolates the test from the JUJU_HOME,
+JUJU_ENV, and JUJU_LOGGING_CONFIG environment variables.
 
 The JujuConnSuite does this and more. It also sets up a state server and api
 server.  This is one problem with the JujuConnSuite, it almost always does a
@@ -174,7 +169,7 @@
 
 ```go
 type ToolsSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 	dataDir string
 }
 
@@ -191,21 +186,19 @@
 
 ```go
 func (t *ToolsSuite) SetUpTest(c *gc.C) {
-	t.BaseSuite.SetUpTest(c)
+	t.LoggingSuite.SetUpTest(c)
 	t.dataDir = c.MkDir()
 }
 ```
 
 If the test suite has multiple contained suites, please call them in the
 order that they are defined, and make sure something that is composed from
-the BaseSuite is first.  They should be torn down in the reverse order.
+the LoggingSuite is first.  They should be torn down in the reverse order.
 
-Even if the code that is being tested currently has no logging or outbound
-network access in it, it is a good idea to use the BaseSuite as a base:
- * it isolates the user's home directory against accidental modification
- * if someone does add outbound network access later, it will be caught
+Even if the code that is being tested currently has no logging in it, it
+is a good idea to use the LoggingSuite as a base for two reasons:
  * it brings in something composed of the CleanupSuite
- * if someone does add logging later, it is captured and doesn't pollute
+ * if someone does add logging later, it is captured and doesn't polute
    the logging output
 
 

=== modified file 'downloader/downloader_test.go'
--- downloader/downloader_test.go	2014-05-20 04:27:02 +0000
+++ downloader/downloader_test.go	2014-05-22 14:33:28 +0000
@@ -14,32 +14,33 @@
 
 	"launchpad.net/juju-core/downloader"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils"
 )
 
 type suite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 	testing.HTTPSuite
 }
 
 func (s *suite) SetUpSuite(c *gc.C) {
-	s.BaseSuite.SetUpSuite(c)
+	s.LoggingSuite.SetUpSuite(c)
 	s.HTTPSuite.SetUpSuite(c)
 }
 
 func (s *suite) TearDownSuite(c *gc.C) {
 	s.HTTPSuite.TearDownSuite(c)
-	s.BaseSuite.TearDownSuite(c)
+	s.LoggingSuite.TearDownSuite(c)
 }
 
 func (s *suite) SetUpTest(c *gc.C) {
-	s.BaseSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	s.HTTPSuite.SetUpTest(c)
 }
 
 func (s *suite) TearDownTest(c *gc.C) {
 	s.HTTPSuite.TearDownTest(c)
-	s.BaseSuite.TearDownTest(c)
+	s.LoggingSuite.TearDownTest(c)
 }
 
 var _ = gc.Suite(&suite{})

=== modified file 'environs/bootstrap/bootstrap_test.go'
--- environs/bootstrap/bootstrap_test.go	2014-05-19 04:28:01 +0000
+++ environs/bootstrap/bootstrap_test.go	2014-05-22 14:33:28 +0000
@@ -24,6 +24,7 @@
 	"launchpad.net/juju-core/juju/arch"
 	"launchpad.net/juju-core/provider/dummy"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
@@ -38,20 +39,23 @@
 )
 
 type bootstrapSuite struct {
-	coretesting.BaseSuite
+	home *coretesting.FakeHome
+	testbase.LoggingSuite
 	envtesting.ToolsFixture
 }
 
 var _ = gc.Suite(&bootstrapSuite{})
 
 func (s *bootstrapSuite) SetUpTest(c *gc.C) {
-	s.BaseSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	s.ToolsFixture.SetUpTest(c)
+	s.home = coretesting.MakeFakeHomeNoEnvironments(c, "foo")
 }
 
 func (s *bootstrapSuite) TearDownTest(c *gc.C) {
+	s.home.Restore()
 	s.ToolsFixture.TearDownTest(c)
-	s.BaseSuite.TearDownTest(c)
+	s.LoggingSuite.TearDownTest(c)
 }
 
 func (s *bootstrapSuite) TestBootstrapNeedsSettings(c *gc.C) {

=== modified file 'environs/bootstrap/interruptiblestorage_test.go'
--- environs/bootstrap/interruptiblestorage_test.go	2014-05-20 04:27:02 +0000
+++ environs/bootstrap/interruptiblestorage_test.go	2014-05-22 14:33:28 +0000
@@ -10,11 +10,11 @@
 
 	"launchpad.net/juju-core/environs/bootstrap"
 	envtesting "launchpad.net/juju-core/environs/testing"
-	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type interruptibleStorageSuite struct {
-	coretesting.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&interruptibleStorageSuite{})

=== modified file 'environs/bootstrap/state_test.go'
--- environs/bootstrap/state_test.go	2014-05-20 04:27:02 +0000
+++ environs/bootstrap/state_test.go	2014-05-22 14:33:28 +0000
@@ -19,11 +19,11 @@
 	"launchpad.net/juju-core/environs/storage"
 	envtesting "launchpad.net/juju-core/environs/testing"
 	"launchpad.net/juju-core/instance"
-	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type StateSuite struct {
-	coretesting.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&StateSuite{})

=== modified file 'environs/cloudinit/cloudinit_test.go'
--- environs/cloudinit/cloudinit_test.go	2014-05-20 04:27:02 +0000
+++ environs/cloudinit/cloudinit_test.go	2014-05-22 14:33:28 +0000
@@ -24,6 +24,7 @@
 	"launchpad.net/juju-core/state/api"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
@@ -31,7 +32,7 @@
 // Use local suite since this file lives in the ec2 package
 // for testing internals.
 type cloudinitSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&cloudinitSuite{})

=== modified file 'environs/cloudinit_test.go'
--- environs/cloudinit_test.go	2014-05-20 04:27:02 +0000
+++ environs/cloudinit_test.go	2014-05-22 14:33:28 +0000
@@ -23,6 +23,7 @@
 	"launchpad.net/juju-core/state/api"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"
@@ -38,7 +39,7 @@
 }
 
 type CloudInitSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&CloudInitSuite{})

=== modified file 'environs/config.go'
--- environs/config.go	2014-05-15 10:31:08 +0000
+++ environs/config.go	2014-05-22 14:33:28 +0000
@@ -98,14 +98,6 @@
 		)
 	}
 
-	// lxc-use-clone has been renamed to lxc-clone
-	if _, ok := attrs["lxc-use-clone"]; ok {
-		logger.Warningf(
-			"Config attribute \"lxc-use-clone\" has been renamed to \"lxc-clone\".\n" +
-				"Please update your environment configuration.",
-		)
-	}
-
 	cfg, err := config.New(config.UseDefaults, attrs)
 	if err != nil {
 		return nil, err

=== modified file 'environs/config/authkeys_test.go'
--- environs/config/authkeys_test.go	2014-05-20 04:27:02 +0000
+++ environs/config/authkeys_test.go	2014-05-22 14:33:28 +0000
@@ -13,19 +13,19 @@
 
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/juju/osenv"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils/ssh"
 )
 
 type AuthKeysSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 	dotssh string // ~/.ssh
 }
 
 var _ = gc.Suite(&AuthKeysSuite{})
 
 func (s *AuthKeysSuite) SetUpTest(c *gc.C) {
-	s.BaseSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	old := osenv.Home()
 	newhome := c.MkDir()
 	osenv.SetHome(newhome)
@@ -37,7 +37,7 @@
 
 func (s *AuthKeysSuite) TearDownTest(c *gc.C) {
 	ssh.ClearClientKeys()
-	s.BaseSuite.TearDownTest(c)
+	s.LoggingSuite.TearDownTest(c)
 }
 
 func (s *AuthKeysSuite) TestReadAuthorizedKeysErrors(c *gc.C) {

=== modified file 'environs/config/config.go'
--- environs/config/config.go	2014-05-15 10:31:08 +0000
+++ environs/config/config.go	2014-05-22 14:33:28 +0000
@@ -258,16 +258,6 @@
 	// Even if the user has edited their environment yaml to remove the deprecated tools-url value,
 	// we still want it in the config for upgrades.
 	cfg.defined["tools-url"], _ = cfg.ToolsURL()
-
-	// Copy across lxc-use-clone to lxc-clone.
-	if lxcUseClone, ok := cfg.defined["lxc-use-clone"]; ok {
-		_, newValSpecified := cfg.LXCUseClone()
-		// Ensure the new attribute name "lxc-clone" is set.
-		if !newValSpecified {
-			cfg.defined["lxc-clone"] = lxcUseClone
-		}
-	}
-
 	// Update the provider type from null to manual.
 	if cfg.Type() == "null" {
 		cfg.defined["type"] = "manual"
@@ -710,16 +700,9 @@
 
 // LXCUseClone reports whether the LXC provisioner should create a
 // template and use cloning to speed up container provisioning.
-func (c *Config) LXCUseClone() (bool, bool) {
-	v, ok := c.defined["lxc-clone"].(bool)
-	return v, ok
-}
-
-// LXCUseCloneAUFS reports whether the LXC provisioner should create a
-// lxc clone using aufs if available.
-func (c *Config) LXCUseCloneAUFS() (bool, bool) {
-	v, ok := c.defined["lxc-clone-aufs"].(bool)
-	return v, ok
+func (c *Config) LXCUseClone() bool {
+	v, _ := c.defined["lxc-use-clone"].(bool)
+	return v
 }
 
 // UnknownAttrs returns a copy of the raw configuration attributes
@@ -798,12 +781,10 @@
 	"bootstrap-addresses-delay": schema.ForceInt(),
 	"test-mode":                 schema.Bool(),
 	"proxy-ssh":                 schema.Bool(),
-	"lxc-clone":                 schema.Bool(),
-	"lxc-clone-aufs":            schema.Bool(),
+	"lxc-use-clone":             schema.Bool(),
 
 	// Deprecated fields, retain for backwards compatibility.
-	"tools-url":     schema.String(),
-	"lxc-use-clone": schema.Bool(),
+	"tools-url": schema.String(),
 }
 
 // alwaysOptional holds configuration defaults for attributes that may
@@ -834,11 +815,9 @@
 	"apt-http-proxy":            schema.Omit,
 	"apt-https-proxy":           schema.Omit,
 	"apt-ftp-proxy":             schema.Omit,
-	"lxc-clone":                 schema.Omit,
 
 	// Deprecated fields, retain for backwards compatibility.
-	"tools-url":     "",
-	"lxc-use-clone": schema.Omit,
+	"tools-url": "",
 
 	// For backward compatibility reasons, the following
 	// attributes default to empty strings rather than being
@@ -860,10 +839,10 @@
 	// Authentication string sent with requests to the charm store
 	"charm-store-auth": "",
 	// Previously image-stream could be set to an empty value
-	"image-stream":   "",
-	"test-mode":      false,
-	"proxy-ssh":      false,
-	"lxc-clone-aufs": false,
+	"image-stream":  "",
+	"test-mode":     false,
+	"proxy-ssh":     false,
+	"lxc-use-clone": false,
 }
 
 func allowEmpty(attr string) bool {
@@ -924,8 +903,7 @@
 	"bootstrap-timeout",
 	"bootstrap-retry-delay",
 	"bootstrap-addresses-delay",
-	"lxc-clone",
-	"lxc-clone-aufs",
+	"lxc-use-clone",
 }
 
 var (

=== modified file 'environs/config/config_test.go'
--- environs/config/config_test.go	2014-05-16 04:57:59 +0000
+++ environs/config/config_test.go	2014-05-22 14:33:28 +0000
@@ -18,6 +18,7 @@
 	"launchpad.net/juju-core/juju/osenv"
 	"launchpad.net/juju-core/schema"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/version"
 )
 
@@ -26,14 +27,14 @@
 }
 
 type ConfigSuite struct {
-	testing.FakeJujuHomeSuite
+	testbase.LoggingSuite
 	home string
 }
 
 var _ = gc.Suite(&ConfigSuite{})
 
 func (s *ConfigSuite) SetUpTest(c *gc.C) {
-	s.FakeJujuHomeSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	// Make sure that the defaults are used, which
 	// is <root>=WARNING
 	loggo.ResetLoggers()
@@ -60,8 +61,7 @@
 type configTest struct {
 	about       string
 	useDefaults config.Defaulting
-	attrs       testing.Attrs
-	expected    testing.Attrs
+	attrs       map[string]interface{}
 	err         string
 }
 
@@ -140,33 +140,6 @@
 			"authorized-keys-path": "~/.ssh/authorized_keys2",
 		},
 	}, {
-		about:       "LXC clone values",
-		useDefaults: config.UseDefaults,
-		attrs: testing.Attrs{
-			"type":           "my-type",
-			"name":           "my-name",
-			"default-series": "precise",
-			"lxc-clone":      true,
-			"lxc-clone-aufs": true,
-		},
-	}, {
-		about:       "Deprecated lxc-use-clone used",
-		useDefaults: config.UseDefaults,
-		attrs: testing.Attrs{
-			"type":          "my-type",
-			"name":          "my-name",
-			"lxc-use-clone": true,
-		},
-	}, {
-		about:       "Deprecated lxc-use-clone ignored",
-		useDefaults: config.UseDefaults,
-		attrs: testing.Attrs{
-			"type":          "my-type",
-			"name":          "my-name",
-			"lxc-use-clone": false,
-			"lxc-clone":     true,
-		},
-	}, {
 		about:       "CA cert & key from path",
 		useDefaults: config.UseDefaults,
 		attrs: testing.Attrs{
@@ -723,7 +696,7 @@
 	name, data string
 }
 
-func (s *ConfigSuite) TestConfig(c *gc.C) {
+func (*ConfigSuite) TestConfig(c *gc.C) {
 	files := []testing.TestFile{
 		{".ssh/id_dsa.pub", "dsa"},
 		{".ssh/id_rsa.pub", "rsa\n"},
@@ -738,10 +711,11 @@
 		{"othercert.pem", caCert3},
 		{"otherkey.pem", caKey3},
 	}
-	s.FakeHomeSuite.Home.AddFiles(c, files...)
+	h := testing.MakeFakeHomeWithFiles(c, files)
+	defer h.Restore()
 	for i, test := range configTests {
 		c.Logf("test %d. %s", i, test.about)
-		test.check(c, s.FakeHomeSuite.Home)
+		test.check(c, h)
 	}
 }
 
@@ -767,10 +741,12 @@
 	},
 }
 
-func (s *ConfigSuite) TestConfigNoCertFiles(c *gc.C) {
+func (*ConfigSuite) TestConfigNoCertFiles(c *gc.C) {
+	h := testing.MakeEmptyFakeHome(c)
+	defer h.Restore()
 	for i, test := range noCertFilesTests {
 		c.Logf("test %d. %s", i, test.about)
-		test.check(c, s.FakeHomeSuite.Home)
+		test.check(c, h)
 	}
 }
 
@@ -827,16 +803,17 @@
 	}, */
 }
 
-func (s *ConfigSuite) TestConfigEmptyCertFiles(c *gc.C) {
+func (*ConfigSuite) TestConfigEmptyCertFiles(c *gc.C) {
 	files := []testing.TestFile{
 		{".juju/my-name-cert.pem", ""},
 		{".juju/my-name-private-key.pem", ""},
 	}
-	s.FakeHomeSuite.Home.AddFiles(c, files...)
+	h := testing.MakeFakeHomeWithFiles(c, files)
+	defer h.Restore()
 
 	for i, test := range emptyCertFilesTests {
 		c.Logf("test %d. %s", i, test.about)
-		test.check(c, s.FakeHomeSuite.Home)
+		test.check(c, h)
 	}
 }
 
@@ -1004,27 +981,6 @@
 		c.Assert(oldURLAttrPresent, jc.IsFalse)
 		c.Assert(oldToolsURL, gc.Equals, "")
 	}
-
-	useLxcClone, useLxcClonePresent := cfg.LXCUseClone()
-	oldUseClone, oldUseClonePresent := cfg.AllAttrs()["lxc-use-clone"]
-	if v, ok := test.attrs["lxc-clone"]; ok {
-		c.Assert(useLxcClone, gc.Equals, v)
-		c.Assert(useLxcClonePresent, jc.IsTrue)
-	} else {
-		if oldUseClonePresent {
-			c.Assert(useLxcClonePresent, jc.IsTrue)
-			c.Assert(useLxcClone, gc.Equals, oldUseClone)
-		} else {
-			c.Assert(useLxcClonePresent, jc.IsFalse)
-			c.Assert(useLxcClone, gc.Equals, false)
-		}
-	}
-	useLxcCloneAufs, ok := cfg.LXCUseCloneAUFS()
-	if v, ok := test.attrs["lxc-clone-aufs"]; ok {
-		c.Assert(useLxcCloneAufs, gc.Equals, v)
-	} else {
-		c.Assert(useLxcCloneAufs, gc.Equals, false)
-	}
 }
 
 func (test configTest) assertDuration(c *gc.C, name string, actual time.Duration, defaultInSeconds int) {
@@ -1072,7 +1028,7 @@
 	attrs["tools-url"] = ""
 	attrs["image-stream"] = ""
 	attrs["proxy-ssh"] = false
-	attrs["lxc-clone-aufs"] = false
+	attrs["lxc-use-clone"] = false
 
 	// Default firewall mode is instance
 	attrs["firewall-mode"] = string(config.FwInstance)
@@ -1156,22 +1112,18 @@
 	new:   testing.Attrs{"bootstrap-timeout": 5},
 	err:   `cannot change bootstrap-timeout from 600 to 5`,
 }, {
-	about: "Cannot change lxc-clone",
-	old:   testing.Attrs{"lxc-clone": false},
-	new:   testing.Attrs{"lxc-clone": true},
-	err:   `cannot change lxc-clone from false to true`,
-}, {
-	about: "Cannot change lxc-clone-aufs",
-	old:   testing.Attrs{"lxc-clone-aufs": false},
-	new:   testing.Attrs{"lxc-clone-aufs": true},
-	err:   `cannot change lxc-clone-aufs from false to true`,
+	about: "Cannot change lxc-use-clone",
+	old:   testing.Attrs{"lxc-use-clone": false},
+	new:   testing.Attrs{"lxc-use-clone": true},
+	err:   `cannot change lxc-use-clone from false to true`,
 }}
 
-func (s *ConfigSuite) TestValidateChange(c *gc.C) {
+func (*ConfigSuite) TestValidateChange(c *gc.C) {
 	files := []testing.TestFile{
 		{".ssh/identity.pub", "identity"},
 	}
-	s.FakeHomeSuite.Home.AddFiles(c, files...)
+	h := testing.MakeFakeHomeWithFiles(c, files)
+	defer h.Restore()
 
 	for i, test := range validationTests {
 		c.Logf("test %d: %s", i, test.about)
@@ -1179,23 +1131,23 @@
 		oldConfig := newTestConfig(c, test.old)
 		err := config.Validate(newConfig, oldConfig)
 		if test.err == "" {
-			c.Check(err, gc.IsNil)
+			c.Assert(err, gc.IsNil)
 		} else {
-			c.Check(err, gc.ErrorMatches, test.err)
+			c.Assert(err, gc.ErrorMatches, test.err)
 		}
 	}
 }
 
-func (s *ConfigSuite) addJujuFiles(c *gc.C) {
-	s.FakeHomeSuite.Home.AddFiles(c, []testing.TestFile{
+func makeFakeHome(c *gc.C) *testing.FakeHome {
+	return testing.MakeFakeHomeWithFiles(c, []testing.TestFile{
 		{".ssh/id_rsa.pub", "rsa\n"},
 		{".juju/myenv-cert.pem", caCert},
 		{".juju/myenv-private-key.pem", caKey},
-	}...)
+	})
 }
 
-func (s *ConfigSuite) TestValidateUnknownAttrs(c *gc.C) {
-	s.addJujuFiles(c)
+func (*ConfigSuite) TestValidateUnknownAttrs(c *gc.C) {
+	defer makeFakeHome(c).Restore()
 	cfg, err := config.New(config.UseDefaults, map[string]interface{}{
 		"name":    "myenv",
 		"type":    "other",
@@ -1247,30 +1199,32 @@
 	return result
 }
 
-func (s *ConfigSuite) TestLoggingConfig(c *gc.C) {
-	s.addJujuFiles(c)
+func (*ConfigSuite) TestLoggingConfig(c *gc.C) {
+	defer makeFakeHome(c).Restore()
+
 	config := newTestConfig(c, testing.Attrs{
 		"logging-config": "<root>=WARNING;juju=DEBUG"})
 	c.Assert(config.LoggingConfig(), gc.Equals, "<root>=WARNING;juju=DEBUG;unit=DEBUG")
 }
 
-func (s *ConfigSuite) TestLoggingConfigWithUnit(c *gc.C) {
-	s.addJujuFiles(c)
+func (*ConfigSuite) TestLoggingConfigWithUnit(c *gc.C) {
+	defer makeFakeHome(c).Restore()
+
 	config := newTestConfig(c, testing.Attrs{
 		"logging-config": "<root>=WARNING;unit=INFO"})
 	c.Assert(config.LoggingConfig(), gc.Equals, "<root>=WARNING;unit=INFO")
 }
 
 func (s *ConfigSuite) TestLoggingConfigFromEnvironment(c *gc.C) {
-	s.addJujuFiles(c)
+	defer makeFakeHome(c).Restore()
 	s.PatchEnvironment(osenv.JujuLoggingConfigEnvKey, "<root>=INFO")
 
 	config := newTestConfig(c, nil)
 	c.Assert(config.LoggingConfig(), gc.Equals, "<root>=INFO;unit=DEBUG")
 }
 
-func (s *ConfigSuite) TestProxyValuesWithFallback(c *gc.C) {
-	s.addJujuFiles(c)
+func (*ConfigSuite) TestProxyValuesWithFallback(c *gc.C) {
+	defer makeFakeHome(c).Restore()
 
 	config := newTestConfig(c, testing.Attrs{
 		"http-proxy":  "http://user@10.0.0.1",
@@ -1287,8 +1241,9 @@
 	c.Assert(config.NoProxy(), gc.Equals, "localhost,10.0.3.1")
 }
 
-func (s *ConfigSuite) TestProxyValues(c *gc.C) {
-	s.addJujuFiles(c)
+func (*ConfigSuite) TestProxyValues(c *gc.C) {
+	defer makeFakeHome(c).Restore()
+
 	config := newTestConfig(c, testing.Attrs{
 		"http-proxy":      "http://user@10.0.0.1",
 		"https-proxy":     "https://user@10.0.0.1",
@@ -1305,8 +1260,9 @@
 	c.Assert(config.AptFtpProxy(), gc.Equals, "ftp://user@10.0.0.2")
 }
 
-func (s *ConfigSuite) TestProxyValuesNotSet(c *gc.C) {
-	s.addJujuFiles(c)
+func (*ConfigSuite) TestProxyValuesNotSet(c *gc.C) {
+	defer makeFakeHome(c).Restore()
+
 	config := newTestConfig(c, testing.Attrs{})
 	c.Assert(config.HttpProxy(), gc.Equals, "")
 	c.Assert(config.AptHttpProxy(), gc.Equals, "")
@@ -1317,8 +1273,9 @@
 	c.Assert(config.NoProxy(), gc.Equals, "")
 }
 
-func (s *ConfigSuite) TestProxyConfigMap(c *gc.C) {
-	s.addJujuFiles(c)
+func (*ConfigSuite) TestProxyConfigMap(c *gc.C) {
+	defer makeFakeHome(c).Restore()
+
 	cfg := newTestConfig(c, testing.Attrs{})
 	proxy := osenv.ProxySettings{
 		Http:    "http proxy",
@@ -1334,8 +1291,9 @@
 	c.Assert(cfg.AptProxySettings(), gc.DeepEquals, proxy)
 }
 
-func (s *ConfigSuite) TestAptProxyConfigMap(c *gc.C) {
-	s.addJujuFiles(c)
+func (*ConfigSuite) TestAptProxyConfigMap(c *gc.C) {
+	defer makeFakeHome(c).Restore()
+
 	cfg := newTestConfig(c, testing.Attrs{})
 	proxy := osenv.ProxySettings{
 		Http:  "http proxy",
@@ -1349,9 +1307,12 @@
 	c.Assert(cfg.AptProxySettings(), gc.DeepEquals, proxy)
 }
 
-func (s *ConfigSuite) TestGenerateStateServerCertAndKey(c *gc.C) {
-	// Add a cert.
-	s.FakeHomeSuite.Home.AddFiles(c, testing.TestFile{".ssh/id_rsa.pub", "rsa\n"})
+func (*ConfigSuite) TestGenerateStateServerCertAndKey(c *gc.C) {
+	// In order to test missing certs, it checks the JUJU_HOME dir, so we need
+	// a fake home.
+	defer testing.MakeFakeHomeWithFiles(c, []testing.TestFile{
+		{".ssh/id_rsa.pub", "rsa\n"},
+	}).Restore()
 
 	for _, test := range []struct {
 		configValues map[string]interface{}

=== modified file 'environs/config_test.go'
--- environs/config_test.go	2014-05-16 04:57:59 +0000
+++ environs/config_test.go	2014-05-22 14:33:28 +0000
@@ -19,17 +19,18 @@
 	"launchpad.net/juju-core/provider/dummy"
 	_ "launchpad.net/juju-core/provider/manual"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type suite struct {
-	testing.FakeJujuHomeSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&suite{})
 
 func (s *suite) TearDownTest(c *gc.C) {
 	dummy.Reset()
-	s.FakeJujuHomeSuite.TearDownTest(c)
+	s.LoggingSuite.TearDownTest(c)
 }
 
 var invalidConfigTests = []struct {
@@ -79,6 +80,7 @@
 }
 
 func (*suite) TestInvalidEnv(c *gc.C) {
+	defer testing.MakeFakeHomeNoEnvironments(c, "only").Restore()
 	for i, t := range invalidEnvTests {
 		c.Logf("running test %v", i)
 		es, err := environs.ReadEnvironsBytes([]byte(t.env))
@@ -95,6 +97,7 @@
 	// However, we can only really trigger that when we have a deprecated
 	// field. If support for the field is removed entirely, another
 	// mechanism will need to be used
+	defer testing.MakeFakeHomeNoEnvironments(c, "only").Restore()
 	content := `
 environments:
     valid:
@@ -104,7 +107,6 @@
         type: dummy
         state-server: false
         tools-url: aknowndeprecatedfield
-        lxc-use-clone: true
 `
 	tw := &loggo.TestWriter{}
 	// we only capture Warning or above
@@ -126,12 +128,12 @@
 	// Only once we grab the deprecated one do we see any warnings
 	_, err = envs.Config("deprecated")
 	c.Check(err, gc.IsNil)
-	c.Check(tw.Log, gc.HasLen, 2)
+	c.Check(tw.Log, gc.HasLen, 1)
 }
 
 func (*suite) TestNoHomeBeforeConfig(c *gc.C) {
 	// Test that we don't actually need HOME set until we call envs.Config()
-	os.Setenv("HOME", "")
+	// Because of this, we intentionally do *not* call testing.MakeFakeHomeNoEnvironments()
 	content := `
 environments:
     valid:
@@ -144,9 +146,7 @@
 }
 
 func (*suite) TestNoEnv(c *gc.C) {
-	envPath := testing.HomePath(".juju", "environments.yaml")
-	err := os.Remove(envPath)
-	c.Assert(err, gc.IsNil)
+	defer testing.MakeFakeHomeNoEnvironments(c).Restore()
 	es, err := environs.ReadEnvirons("")
 	c.Assert(es, gc.IsNil)
 	c.Assert(err, jc.Satisfies, environs.IsNoEnv)
@@ -197,6 +197,7 @@
 }
 
 func (*suite) TestConfig(c *gc.C) {
+	defer testing.MakeFakeHomeNoEnvironments(c, "only", "valid", "one", "two").Restore()
 	for i, t := range configTests {
 		c.Logf("running test %v", i)
 		envs, err := environs.ReadEnvironsBytes([]byte(t.env))
@@ -206,6 +207,8 @@
 }
 
 func (*suite) TestDefaultConfigFile(c *gc.C) {
+	defer testing.MakeEmptyFakeHome(c).Restore()
+
 	env := `
 environments:
     only:
@@ -225,8 +228,8 @@
 	c.Assert(cfg.Name(), gc.Equals, "only")
 }
 
-func (s *suite) TestConfigPerm(c *gc.C) {
-	testing.MakeSampleJujuHome(c)
+func (*suite) TestConfigPerm(c *gc.C) {
+	defer testing.MakeSampleHome(c).Restore()
 
 	path := testing.HomePath(".juju")
 	info, err := os.Lstat(path)
@@ -253,6 +256,7 @@
 }
 
 func (*suite) TestNamedConfigFile(c *gc.C) {
+	defer testing.MakeFakeHomeNoEnvironments(c, "only").Restore()
 
 	env := `
 environments:
@@ -279,6 +283,7 @@
 }
 
 func (*suite) TestBootstrapConfig(c *gc.C) {
+	defer testing.MakeFakeHomeNoEnvironments(c, "bladaam").Restore()
 	attrs := dummySampleConfig().Merge(testing.Attrs{
 		"agent-version": "1.2.3",
 	})
@@ -405,6 +410,7 @@
 }
 
 func (s *ConfigDeprecationSuite) checkDeprecationWarning(c *gc.C, attrs testing.Attrs, expectedMsg string) {
+	defer testing.MakeFakeHomeNoEnvironments(c, "only").Restore()
 	content := `
 environments:
     deprecated:
@@ -449,9 +455,3 @@
 	expected := `Provider type \"null\" has been renamed to \"manual\"\.Please update your environment configuration\.`
 	s.checkDeprecationWarning(c, attrs, expected)
 }
-
-func (s *ConfigDeprecationSuite) TestDeprecatedLxcUseCloneWarning(c *gc.C) {
-	attrs := testing.Attrs{"lxc-use-clone": true}
-	expected := `Config attribute \"lxc-use-clone\" has been renamed to \"lxc-clone\".Please update your environment configuration\.`
-	s.checkDeprecationWarning(c, attrs, expected)
-}

=== modified file 'environs/configstore/disk_test.go'
--- environs/configstore/disk_test.go	2014-05-20 04:27:02 +0000
+++ environs/configstore/disk_test.go	2014-05-22 14:33:28 +0000
@@ -17,7 +17,7 @@
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/environs/configstore"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 var _ = gc.Suite(&diskInterfaceSuite{})
@@ -63,7 +63,7 @@
 var _ = gc.Suite(&diskStoreSuite{})
 
 type diskStoreSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 }
 
 func (*diskStoreSuite) TestNewDisk(c *gc.C) {

=== modified file 'environs/configstore/interface_test.go'
--- environs/configstore/interface_test.go	2014-05-20 04:27:02 +0000
+++ environs/configstore/interface_test.go	2014-05-22 14:33:28 +0000
@@ -8,7 +8,7 @@
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/environs/configstore"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 // interfaceSuite defines a set of tests on a ConfigStorage
@@ -16,7 +16,7 @@
 // The NewStore field must be set up to return a ConfigStorage
 // instance of the type to be tested.
 type interfaceSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 	NewStore func(c *gc.C) configstore.Storage
 }
 

=== modified file 'environs/emptystorage_test.go'
--- environs/emptystorage_test.go	2014-05-16 01:33:13 +0000
+++ environs/emptystorage_test.go	2014-05-22 14:33:28 +0000
@@ -14,10 +14,11 @@
 	"launchpad.net/juju-core/environs/storage"
 	"launchpad.net/juju-core/provider/dummy"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type EmptyStorageSuite struct {
-	testing.FakeJujuHomeSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&EmptyStorageSuite{})
@@ -41,7 +42,7 @@
 }
 
 type verifyStorageSuite struct {
-	testing.FakeJujuHomeSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&verifyStorageSuite{})
@@ -54,17 +55,14 @@
         authorized-keys: i-am-a-key
 `
 
-func (s *verifyStorageSuite) SetUpTest(c *gc.C) {
-	s.FakeJujuHomeSuite.SetUpTest(c)
-	testing.WriteEnvironments(c, existingEnv)
-}
-
 func (s *verifyStorageSuite) TearDownTest(c *gc.C) {
 	dummy.Reset()
-	s.FakeJujuHomeSuite.TearDownTest(c)
+	s.LoggingSuite.TearDownTest(c)
 }
 
 func (s *verifyStorageSuite) TestVerifyStorage(c *gc.C) {
+	defer testing.MakeFakeHome(c, existingEnv, "existing").Restore()
+
 	ctx := testing.Context(c)
 	environ, err := environs.PrepareFromName("test", ctx, configstore.NewMem())
 	c.Assert(err, gc.IsNil)
@@ -81,6 +79,8 @@
 }
 
 func (s *verifyStorageSuite) TestVerifyStorageFails(c *gc.C) {
+	defer testing.MakeFakeHome(c, existingEnv, "existing").Restore()
+
 	ctx := testing.Context(c)
 	environ, err := environs.PrepareFromName("test", ctx, configstore.NewMem())
 	c.Assert(err, gc.IsNil)

=== modified file 'environs/httpstorage/backend_test.go'
--- environs/httpstorage/backend_test.go	2014-05-20 04:27:02 +0000
+++ environs/httpstorage/backend_test.go	2014-05-22 14:33:28 +0000
@@ -22,6 +22,7 @@
 	"launchpad.net/juju-core/environs/filestorage"
 	"launchpad.net/juju-core/environs/httpstorage"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils"
 )
 
@@ -32,7 +33,7 @@
 }
 
 type backendSuite struct {
-	coretesting.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&backendSuite{})

=== modified file 'environs/imagemetadata/generate_test.go'
--- environs/imagemetadata/generate_test.go	2014-05-20 04:27:02 +0000
+++ environs/imagemetadata/generate_test.go	2014-05-22 14:33:28 +0000
@@ -11,13 +11,13 @@
 	"launchpad.net/juju-core/environs/imagemetadata/testing"
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/storage"
-	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 var _ = gc.Suite(&generateSuite{})
 
 type generateSuite struct {
-	coretesting.BaseSuite
+	testbase.LoggingSuite
 }
 
 func assertFetch(c *gc.C, stor storage.Storage, series, arch, region, endpoint, id string) {

=== modified file 'environs/imagemetadata/marshal_test.go'
--- environs/imagemetadata/marshal_test.go	2014-05-20 04:27:02 +0000
+++ environs/imagemetadata/marshal_test.go	2014-05-22 14:33:28 +0000
@@ -10,13 +10,13 @@
 
 	"launchpad.net/juju-core/environs/imagemetadata"
 	"launchpad.net/juju-core/environs/simplestreams"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 var _ = gc.Suite(&marshalSuite{})
 
 type marshalSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 }
 
 var expectedIndex = `{

=== modified file 'environs/imagemetadata/upload_test.go'
--- environs/imagemetadata/upload_test.go	2014-05-20 04:27:02 +0000
+++ environs/imagemetadata/upload_test.go	2014-05-22 14:33:28 +0000
@@ -17,13 +17,13 @@
 	"launchpad.net/juju-core/environs/imagemetadata/testing"
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/storage"
-	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 var _ = gc.Suite(&uploadSuite{})
 
 type uploadSuite struct {
-	coretesting.BaseSuite
+	testbase.LoggingSuite
 }
 
 func createImageMetadata(c *gc.C) (sourceDir string, destDir string, destStor storage.Storage, metadata *imagemetadata.ImageMetadata) {

=== modified file 'environs/imagemetadata/urls_test.go'
--- environs/imagemetadata/urls_test.go	2014-05-15 05:14:01 +0000
+++ environs/imagemetadata/urls_test.go	2014-05-22 14:33:28 +0000
@@ -15,18 +15,21 @@
 	sstesting "launchpad.net/juju-core/environs/simplestreams/testing"
 	"launchpad.net/juju-core/provider/dummy"
 	"launchpad.net/juju-core/testing"
-	coretesting "launchpad.net/juju-core/testing"
 )
 
 type URLsSuite struct {
-	coretesting.BaseSuite
+	home *testing.FakeHome
 }
 
 var _ = gc.Suite(&URLsSuite{})
 
+func (s *URLsSuite) SetUpTest(c *gc.C) {
+	s.home = testing.MakeEmptyFakeHome(c)
+}
+
 func (s *URLsSuite) TearDownTest(c *gc.C) {
 	dummy.Reset()
-	s.BaseSuite.TearDownTest(c)
+	s.home.Restore()
 }
 
 func (s *URLsSuite) env(c *gc.C, imageMetadataURL, stream string) environs.Environ {

=== modified file 'environs/imagemetadata/validation_test.go'
--- environs/imagemetadata/validation_test.go	2014-05-20 04:27:02 +0000
+++ environs/imagemetadata/validation_test.go	2014-05-22 14:33:28 +0000
@@ -12,12 +12,12 @@
 	"launchpad.net/juju-core/environs/filestorage"
 	"launchpad.net/juju-core/environs/imagemetadata"
 	"launchpad.net/juju-core/environs/simplestreams"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils"
 )
 
 type ValidateSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 	metadataDir string
 }
 
@@ -45,7 +45,7 @@
 }
 
 func (s *ValidateSuite) SetUpTest(c *gc.C) {
-	s.BaseSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	s.metadataDir = c.MkDir()
 }
 

=== modified file 'environs/instances/image.go'
--- environs/instances/image.go	2014-05-16 09:58:00 +0000
+++ environs/instances/image.go	2014-05-22 14:33:28 +0000
@@ -5,7 +5,6 @@
 
 import (
 	"fmt"
-	"sort"
 
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs/imagemetadata"
@@ -45,8 +44,6 @@
 type InstanceSpec struct {
 	InstanceType InstanceType
 	Image        Image
-	// order is used to sort InstanceSpec based on the input InstanceTypes.
-	order int
 }
 
 // FindInstanceSpec returns an InstanceSpec satisfying the supplied InstanceConstraint.
@@ -86,17 +83,13 @@
 	for _, itype := range matchingTypes {
 		for _, image := range possibleImages {
 			if image.match(itype) {
-				specs = append(specs, &InstanceSpec{
-					InstanceType: itype,
-					Image:        image,
-					order:        len(specs),
-				})
+				specs = append(specs, &InstanceSpec{itype, image})
 			}
 		}
 	}
-	if len(specs) > 0 {
-		sort.Sort(byArch(specs))
-		return specs[0], nil
+
+	if spec := preferredSpec(specs); spec != nil {
+		return spec, nil
 	}
 
 	names := make([]string, len(matchingTypes))
@@ -106,39 +99,21 @@
 	return nil, fmt.Errorf("no %q images in %s matching instance types %v", ic.Series, ic.Region, names)
 }
 
-// byArch sorts InstanceSpecs first by descending word-size, then
-// alphabetically by name, and choose the first spec in the sequence.
-type byArch []*InstanceSpec
-
-func (a byArch) Len() int {
-	return len(a)
-}
-
-func (a byArch) Less(i, j int) bool {
-	iArchName := a[i].Image.Arch
-	jArchName := a[j].Image.Arch
-	iArch := arch.Info[iArchName]
-	jArch := arch.Info[jArchName]
-	// Wider word-size first.
-	switch {
-	case iArch.WordSize > jArch.WordSize:
-		return true
-	case iArch.WordSize < jArch.WordSize:
-		return false
-	}
-	// Alphabetically by arch name.
-	switch {
-	case iArchName < jArchName:
-		return true
-	case iArchName > jArchName:
-		return false
-	}
-	// If word-size and name the same, keep stable.
-	return a[i].order < a[j].order
-}
-
-func (a byArch) Swap(i, j int) {
-	a[i], a[j] = a[j], a[i]
+// preferredSpec will if possible return a spec with arch matching that
+// of the host machine.
+func preferredSpec(specs []*InstanceSpec) *InstanceSpec {
+	if len(specs) > 1 {
+		hostArch := arch.HostArch()
+		for _, spec := range specs {
+			if spec.Image.Arch == hostArch {
+				return spec
+			}
+		}
+	}
+	if len(specs) > 0 {
+		return specs[0]
+	}
+	return nil
 }
 
 // Image holds the attributes that vary amongst relevant images for

=== modified file 'environs/instances/image_test.go'
--- environs/instances/image_test.go	2014-05-20 04:27:02 +0000
+++ environs/instances/image_test.go	2014-05-22 14:33:28 +0000
@@ -11,12 +11,13 @@
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs/imagemetadata"
 	"launchpad.net/juju-core/environs/simplestreams"
-	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/juju/arch"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils"
 )
 
 type imageSuite struct {
-	coretesting.BaseSuite
+	testbase.LoggingSuite
 }
 
 func Test(t *testing.T) {
@@ -90,10 +91,10 @@
        }
      }
    },
-   "com.ubuntu.cloud:server:12.04:armhf": {
+   "com.ubuntu.cloud:server:12.04:arm": {
      "release": "precise",
      "version": "12.04",
-     "arch": "armhf",
+     "arch": "arm",
      "versions": {
        "20121218": {
          "items": {
@@ -116,57 +117,7 @@
              "id": "ami-00000036"
            }
          },
-         "pubname": "ubuntu-precise-12.04-armhf-server-20121218",
-         "label": "release"
-       }
-     }
-   },
-   "com.ubuntu.cloud:server:12.04:i386": {
-     "release": "precise",
-     "version": "12.04",
-     "arch": "i386",
-     "versions": {
-       "20121218": {
-         "items": {
-           "apne1pe": {
-             "root_store": "ebs",
-             "virt": "pv",
-             "region": "ap-northeast-1",
-             "id": "ami-b79b09b6"
-           },
-           "test1pe": {
-             "root_store": "ebs",
-             "virt": "pv",
-             "region": "test",
-             "id": "ami-b79b09b7"
-           }
-         },
-         "pubname": "ubuntu-precise-12.04-i386-server-20121218",
-         "label": "release"
-       }
-     }
-   },
-   "com.ubuntu.cloud:server:12.04:ppc64": {
-     "release": "precise",
-     "version": "12.04",
-     "arch": "ppc64",
-     "versions": {
-       "20121218": {
-         "items": {
-           "apne1pe": {
-             "root_store": "ebs",
-             "virt": "pv",
-             "region": "ap-northeast-1",
-             "id": "ami-b79b09b8"
-           },
-           "test1pe": {
-             "root_store": "ebs",
-             "virt": "pv",
-             "region": "test",
-             "id": "ami-b79b09b9"
-           }
-         },
-         "pubname": "ubuntu-precise-12.04-ppc64-server-20121218",
+         "pubname": "ubuntu-precise-12.04-arm-server-20121218",
          "label": "release"
        }
      }
@@ -216,10 +167,10 @@
 
 func (p *instanceSpecTestParams) init() {
 	if p.arches == nil {
-		p.arches = []string{"amd64", "armhf"}
+		p.arches = []string{"amd64", "arm"}
 	}
 	if p.instanceTypes == nil {
-		p.instanceTypes = []InstanceType{{Id: "1", Name: "it-1", Arches: []string{"amd64", "armhf"}}}
+		p.instanceTypes = []InstanceType{{Id: "1", Name: "it-1", Arches: []string{"amd64", "arm"}}}
 		p.instanceTypeId = "1"
 		p.instanceTypeName = "it-1"
 	}
@@ -236,42 +187,6 @@
 		},
 	},
 	{
-		desc:    "prefer amd64 over i386",
-		region:  "test",
-		imageId: "ami-00000033",
-		arches:  []string{"amd64", "i386"},
-		instanceTypes: []InstanceType{
-			{Id: "1", Name: "it-1", Arches: []string{"i386", "amd64"}, VirtType: &pv, Mem: 512},
-		},
-	},
-	{
-		desc:    "prefer armhf over i386 (first alphabetical wins)",
-		region:  "test",
-		imageId: "ami-00000034",
-		arches:  []string{"armhf", "i386"},
-		instanceTypes: []InstanceType{
-			{Id: "1", Name: "it-1", Arches: []string{"armhf", "i386"}, VirtType: &pv, Mem: 512},
-		},
-	},
-	{
-		desc:    "prefer ppc64 over i386 (64-bit trumps 32-bit, regardless of alphabetical order)",
-		region:  "test",
-		imageId: "ami-b79b09b9",
-		arches:  []string{"ppc64", "i386"},
-		instanceTypes: []InstanceType{
-			{Id: "1", Name: "it-1", Arches: []string{"i386", "ppc64"}, VirtType: &pv, Mem: 512},
-		},
-	},
-	{
-		desc:    "prefer amd64 over arm64 (first 64-bit alphabetical wins)",
-		region:  "test",
-		imageId: "ami-00000033",
-		arches:  []string{"arm64", "amd64"},
-		instanceTypes: []InstanceType{
-			{Id: "1", Name: "it-1", Arches: []string{"arm64", "amd64"}, VirtType: &pv, Mem: 512},
-		},
-	},
-	{
 		desc:    "explicit release stream",
 		region:  "test",
 		stream:  "released",
@@ -328,7 +243,7 @@
 	{
 		desc:   "no image exists in metadata",
 		region: "invalid-region",
-		err:    `no "precise" images in invalid-region with arches \[amd64 armhf\]`,
+		err:    `no "precise" images in invalid-region with arches \[amd64 arm\]`,
 	},
 	{
 		desc:          "no valid instance types",
@@ -392,6 +307,44 @@
 	}
 }
 
+func (s *imageSuite) TestPreferredSpec(c *gc.C) {
+	type prefTest struct {
+		desc     string
+		specs    []*InstanceSpec
+		expected *InstanceSpec
+	}
+
+	s.PatchValue(&arch.HostArch, func() string { return arch.ARM64 })
+
+	amd64 := &InstanceSpec{Image: Image{Arch: arch.AMD64}}
+	i386 := &InstanceSpec{Image: Image{Arch: arch.I386}}
+	arm64 := &InstanceSpec{Image: Image{Arch: arch.ARM64}}
+
+	prefTests := []prefTest{
+		{
+			"choose hostarch (arm64) over other arches",
+			[]*InstanceSpec{i386, arm64, amd64},
+			arm64,
+		},
+		{
+			"choose first image if no arm64",
+			[]*InstanceSpec{i386, amd64},
+			i386,
+		},
+		{
+			"choose only image only one there",
+			[]*InstanceSpec{amd64},
+			amd64,
+		},
+	}
+
+	for n, test := range prefTests {
+		c.Logf("PreferredSpec test %d: %s", n, test.desc)
+		actual := preferredSpec(test.specs)
+		c.Assert(actual, gc.Equals, test.expected)
+	}
+}
+
 var imageMatchtests = []struct {
 	image Image
 	itype InstanceType
@@ -403,14 +356,14 @@
 		match: true,
 	}, {
 		image: Image{Arch: "amd64"},
-		itype: InstanceType{Arches: []string{"amd64", "armhf"}},
+		itype: InstanceType{Arches: []string{"amd64", "arm"}},
 		match: true,
 	}, {
 		image: Image{Arch: "amd64", VirtType: hvm},
 		itype: InstanceType{Arches: []string{"amd64"}, VirtType: &hvm},
 		match: true,
 	}, {
-		image: Image{Arch: "armhf"},
+		image: Image{Arch: "arm"},
 		itype: InstanceType{Arches: []string{"amd64"}},
 	}, {
 		image: Image{Arch: "amd64", VirtType: hvm},

=== modified file 'environs/instances/instancetype_test.go'
--- environs/instances/instancetype_test.go	2014-05-20 04:27:02 +0000
+++ environs/instances/instancetype_test.go	2014-05-22 14:33:28 +0000
@@ -9,11 +9,11 @@
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/constraints"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type instanceTypeSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&instanceTypeSuite{})

=== modified file 'environs/jujutest/livetests.go'
--- environs/jujutest/livetests.go	2014-05-20 00:11:22 +0000
+++ environs/jujutest/livetests.go	2014-05-22 14:33:28 +0000
@@ -33,6 +33,7 @@
 	"launchpad.net/juju-core/state/api"
 	statetesting "launchpad.net/juju-core/state/testing"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"
@@ -42,6 +43,7 @@
 // (e.g. Amazon EC2).  The Environ is opened once only for all the tests
 // in the suite, stored in Env, and Destroyed after the suite has completed.
 type LiveTests struct {
+	testbase.LoggingSuite
 	envtesting.ToolsFixture
 
 	// TestConfig contains the configuration attributes for opening an environment.
@@ -73,9 +75,15 @@
 }
 
 func (t *LiveTests) SetUpSuite(c *gc.C) {
+	t.LoggingSuite.SetUpSuite(c)
 	t.ConfigStore = configstore.NewMem()
 }
 
+func (t *LiveTests) SetUpTest(c *gc.C) {
+	t.LoggingSuite.SetUpTest(c)
+	t.ToolsFixture.SetUpTest(c)
+}
+
 func publicAttrs(e environs.Environ) map[string]interface{} {
 	cfg := e.Config()
 	secrets, err := e.Provider().SecretAttrs(cfg)
@@ -93,6 +101,12 @@
 	if t.Env != nil {
 		t.Destroy(c)
 	}
+	t.LoggingSuite.TearDownSuite(c)
+}
+
+func (t *LiveTests) TearDownTest(c *gc.C) {
+	t.ToolsFixture.TearDownTest(c)
+	t.LoggingSuite.TearDownTest(c)
 }
 
 // PrepareOnce ensures that the environment is
@@ -122,7 +136,7 @@
 		_, err := sync.Upload(t.Env.Storage(), nil, coretesting.FakeDefaultSeries)
 		c.Assert(err, gc.IsNil)
 	}
-	t.UploadFakeTools(c, t.Env.Storage())
+	envtesting.UploadFakeTools(c, t.Env.Storage())
 	err := bootstrap.EnsureNotBootstrapped(t.Env)
 	c.Assert(err, gc.IsNil)
 	err = bootstrap.Bootstrap(coretesting.Context(c), t.Env, environs.BootstrapParams{Constraints: cons})
@@ -157,7 +171,7 @@
 // that it does not assume a pristine environment.
 func (t *LiveTests) TestStartStop(c *gc.C) {
 	t.PrepareOnce(c)
-	t.UploadFakeTools(c, t.Env.Storage())
+	envtesting.UploadFakeTools(c, t.Env.Storage())
 
 	inst, _ := testing.AssertStartInstance(c, t.Env, "0")
 	c.Assert(inst, gc.NotNil)
@@ -211,7 +225,7 @@
 
 func (t *LiveTests) TestPorts(c *gc.C) {
 	t.PrepareOnce(c)
-	t.UploadFakeTools(c, t.Env.Storage())
+	envtesting.UploadFakeTools(c, t.Env.Storage())
 
 	inst1, _ := testing.AssertStartInstance(c, t.Env, "1")
 	c.Assert(inst1, gc.NotNil)
@@ -300,7 +314,7 @@
 
 func (t *LiveTests) TestGlobalPorts(c *gc.C) {
 	t.PrepareOnce(c)
-	t.UploadFakeTools(c, t.Env.Storage())
+	envtesting.UploadFakeTools(c, t.Env.Storage())
 
 	// Change configuration.
 	oldConfig := t.Env.Config()

=== modified file 'environs/jujutest/tests.go'
--- environs/jujutest/tests.go	2014-05-19 09:06:00 +0000
+++ environs/jujutest/tests.go	2014-05-22 14:33:28 +0000
@@ -22,6 +22,7 @@
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju/testing"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"
 )
@@ -32,6 +33,7 @@
 // is opened once for each test, and some potentially expensive operations
 // may be executed.
 type Tests struct {
+	testbase.LoggingSuite
 	TestConfig coretesting.Attrs
 	envtesting.ToolsFixture
 
@@ -64,17 +66,19 @@
 }
 
 func (t *Tests) SetUpTest(c *gc.C) {
+	t.LoggingSuite.SetUpTest(c)
 	t.ToolsFixture.SetUpTest(c)
 	t.ConfigStore = configstore.NewMem()
 }
 
 func (t *Tests) TearDownTest(c *gc.C) {
 	t.ToolsFixture.TearDownTest(c)
+	t.LoggingSuite.TearDownTest(c)
 }
 
 func (t *Tests) TestStartStop(c *gc.C) {
 	e := t.Prepare(c)
-	t.UploadFakeTools(c, e.Storage())
+	envtesting.UploadFakeTools(c, e.Storage())
 	cfg, err := e.Config().Apply(map[string]interface{}{
 		"agent-version": version.Current.Number.String(),
 	})
@@ -125,7 +129,7 @@
 
 func (t *Tests) TestBootstrap(c *gc.C) {
 	e := t.Prepare(c)
-	t.UploadFakeTools(c, e.Storage())
+	envtesting.UploadFakeTools(c, e.Storage())
 	err := bootstrap.EnsureNotBootstrapped(e)
 	c.Assert(err, gc.IsNil)
 	err = bootstrap.Bootstrap(coretesting.Context(c), e, environs.BootstrapParams{})
@@ -139,7 +143,7 @@
 	c.Assert(err, gc.ErrorMatches, "environment is already bootstrapped")
 
 	e2 := t.Open(c)
-	t.UploadFakeTools(c, e2.Storage())
+	envtesting.UploadFakeTools(c, e2.Storage())
 	err = bootstrap.EnsureNotBootstrapped(e2)
 	c.Assert(err, gc.ErrorMatches, "environment is already bootstrapped")
 
@@ -152,7 +156,7 @@
 
 	// Prepare again because Destroy invalidates old environments.
 	e3 := t.Prepare(c)
-	t.UploadFakeTools(c, e3.Storage())
+	envtesting.UploadFakeTools(c, e3.Storage())
 
 	err = bootstrap.EnsureNotBootstrapped(e3)
 	c.Assert(err, gc.IsNil)

=== modified file 'environs/manual/addresses_test.go'
--- environs/manual/addresses_test.go	2014-05-20 04:27:02 +0000
+++ environs/manual/addresses_test.go	2014-05-22 14:33:28 +0000
@@ -10,7 +10,7 @@
 
 	"launchpad.net/juju-core/environs/manual"
 	"launchpad.net/juju-core/instance"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 const (
@@ -19,7 +19,7 @@
 )
 
 type addressesSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 	netLookupHostCalled int
 }
 

=== modified file 'environs/manual/init_test.go'
--- environs/manual/init_test.go	2014-05-20 04:27:02 +0000
+++ environs/manual/init_test.go	2014-05-22 14:33:28 +0000
@@ -10,11 +10,11 @@
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/environs/manual"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type initialisationSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&initialisationSuite{})

=== modified file 'environs/open_test.go'
--- environs/open_test.go	2014-05-16 01:33:13 +0000
+++ environs/open_test.go	2014-05-22 14:33:28 +0000
@@ -18,23 +18,18 @@
 	envtesting "launchpad.net/juju-core/environs/testing"
 	"launchpad.net/juju-core/provider/dummy"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type OpenSuite struct {
-	testing.FakeJujuHomeSuite
+	testbase.LoggingSuite
 	envtesting.ToolsFixture
 }
 
 var _ = gc.Suite(&OpenSuite{})
 
-func (s *OpenSuite) SetUpTest(c *gc.C) {
-	s.FakeJujuHomeSuite.SetUpTest(c)
-	testing.WriteEnvironments(c, testing.MultipleEnvConfigNoDefault)
-}
-
-func (s *OpenSuite) TearDownTest(c *gc.C) {
+func (*OpenSuite) TearDownTest(c *gc.C) {
 	dummy.Reset()
-	s.FakeJujuHomeSuite.TearDownTest(c)
 }
 
 func (*OpenSuite) TestNewDummyEnviron(c *gc.C) {
@@ -59,6 +54,7 @@
 }
 
 func (*OpenSuite) TestNewFromName(c *gc.C) {
+	defer testing.MakeFakeHome(c, testing.MultipleEnvConfigNoDefault, testing.SampleCertName).Restore()
 	store := configstore.NewMem()
 	ctx := testing.Context(c)
 	e, err := environs.PrepareFromName("erewhemos", ctx, store)
@@ -70,6 +66,7 @@
 }
 
 func (*OpenSuite) TestNewFromNameWithInvalidInfo(c *gc.C) {
+	defer testing.MakeFakeHome(c, testing.MultipleEnvConfigNoDefault, testing.SampleCertName).Restore()
 	store := configstore.NewMem()
 	cfg, _, err := environs.ConfigForName("erewhemos", store)
 	c.Assert(err, gc.IsNil)
@@ -89,6 +86,7 @@
 }
 
 func (*OpenSuite) TestNewFromNameWithInvalidEnvironConfig(c *gc.C) {
+	defer testing.MakeFakeHome(c, testing.MultipleEnvConfigNoDefault, testing.SampleCertName).Restore()
 	store := configstore.NewMem()
 
 	e, err := environs.NewFromName("erewhemos", store)
@@ -97,6 +95,7 @@
 }
 
 func (*OpenSuite) TestPrepareFromName(c *gc.C) {
+	defer testing.MakeFakeHome(c, testing.MultipleEnvConfigNoDefault, testing.SampleCertName).Restore()
 	ctx := testing.Context(c)
 	e, err := environs.PrepareFromName("erewhemos", ctx, configstore.NewMem())
 	c.Assert(err, gc.IsNil)
@@ -106,6 +105,7 @@
 }
 
 func (*OpenSuite) TestConfigForName(c *gc.C) {
+	defer testing.MakeFakeHome(c, testing.MultipleEnvConfigNoDefault, testing.SampleCertName).Restore()
 	cfg, source, err := environs.ConfigForName("erewhemos", configstore.NewMem())
 	c.Assert(err, gc.IsNil)
 	c.Assert(source, gc.Equals, environs.ConfigFromEnvirons)
@@ -113,6 +113,7 @@
 }
 
 func (*OpenSuite) TestConfigForNameNoDefault(c *gc.C) {
+	defer testing.MakeFakeHome(c, testing.MultipleEnvConfigNoDefault, testing.SampleCertName).Restore()
 	cfg, source, err := environs.ConfigForName("", configstore.NewMem())
 	c.Assert(err, gc.ErrorMatches, "no default environment found")
 	c.Assert(cfg, gc.IsNil)
@@ -120,7 +121,7 @@
 }
 
 func (*OpenSuite) TestConfigForNameDefault(c *gc.C) {
-	testing.WriteEnvironments(c, testing.SingleEnvConfig)
+	defer testing.MakeFakeHome(c, testing.SingleEnvConfig, testing.SampleCertName).Restore()
 	cfg, source, err := environs.ConfigForName("", configstore.NewMem())
 	c.Assert(err, gc.IsNil)
 	c.Assert(cfg.Name(), gc.Equals, "erewhemos")
@@ -128,7 +129,7 @@
 }
 
 func (*OpenSuite) TestConfigForNameFromInfo(c *gc.C) {
-	testing.WriteEnvironments(c, testing.SingleEnvConfig)
+	defer testing.MakeFakeHome(c, testing.SingleEnvConfig, testing.SampleCertName).Restore()
 	store := configstore.NewMem()
 	cfg, source, err := environs.ConfigForName("", store)
 	c.Assert(err, gc.IsNil)
@@ -325,23 +326,17 @@
         authorized-keys: i-am-a-key
 `
 
-type checkEnvironmentSuite struct {
-	testing.FakeJujuHomeSuite
-}
+type checkEnvironmentSuite struct{}
 
 var _ = gc.Suite(&checkEnvironmentSuite{})
 
-func (s *checkEnvironmentSuite) SetUpTest(c *gc.C) {
-	s.FakeJujuHomeSuite.SetUpTest(c)
-	testing.WriteEnvironments(c, checkEnv)
-}
-
 func (s *checkEnvironmentSuite) TearDownTest(c *gc.C) {
 	dummy.Reset()
-	s.FakeJujuHomeSuite.TearDownTest(c)
 }
 
 func (s *checkEnvironmentSuite) TestCheckEnvironment(c *gc.C) {
+	defer testing.MakeFakeHome(c, checkEnv, "existing").Restore()
+
 	ctx := testing.Context(c)
 	environ, err := environs.PrepareFromName("test", ctx, configstore.NewMem())
 	c.Assert(err, gc.IsNil)
@@ -356,6 +351,8 @@
 }
 
 func (s *checkEnvironmentSuite) TestCheckEnvironmentFileNotFound(c *gc.C) {
+	defer testing.MakeFakeHome(c, checkEnv, "existing").Restore()
+
 	ctx := testing.Context(c)
 	environ, err := environs.PrepareFromName("test", ctx, configstore.NewMem())
 	c.Assert(err, gc.IsNil)
@@ -376,6 +373,8 @@
 }
 
 func (s *checkEnvironmentSuite) TestCheckEnvironmentGetFails(c *gc.C) {
+	defer testing.MakeFakeHome(c, checkEnv, "existing").Restore()
+
 	ctx := testing.Context(c)
 	environ, err := environs.PrepareFromName("test", ctx, configstore.NewMem())
 	c.Assert(err, gc.IsNil)
@@ -395,6 +394,8 @@
 }
 
 func (s *checkEnvironmentSuite) TestCheckEnvironmentBadContent(c *gc.C) {
+	defer testing.MakeFakeHome(c, checkEnv, "existing").Restore()
+
 	ctx := testing.Context(c)
 	environ, err := environs.PrepareFromName("test", ctx, configstore.NewMem())
 	c.Assert(err, gc.IsNil)

=== modified file 'environs/simplestreams/testing/testing.go'
--- environs/simplestreams/testing/testing.go	2014-05-20 04:27:02 +0000
+++ environs/simplestreams/testing/testing.go	2014-05-22 14:33:28 +0000
@@ -13,7 +13,7 @@
 
 	"launchpad.net/juju-core/environs/jujutest"
 	"launchpad.net/juju-core/environs/simplestreams"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/version/ubuntu"
 )
 
@@ -506,7 +506,7 @@
 }
 
 type LocalLiveSimplestreamsSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 	Source          simplestreams.DataSource
 	RequireSigned   bool
 	DataType        string
@@ -514,11 +514,11 @@
 }
 
 func (s *LocalLiveSimplestreamsSuite) SetUpSuite(c *gc.C) {
-	s.BaseSuite.SetUpSuite(c)
+	s.LoggingSuite.SetUpSuite(c)
 }
 
 func (s *LocalLiveSimplestreamsSuite) TearDownSuite(c *gc.C) {
-	s.BaseSuite.TearDownSuite(c)
+	s.LoggingSuite.TearDownSuite(c)
 }
 
 const (

=== modified file 'environs/sshstorage/storage_test.go'
--- environs/sshstorage/storage_test.go	2014-05-20 04:27:02 +0000
+++ environs/sshstorage/storage_test.go	2014-05-22 14:33:28 +0000
@@ -22,13 +22,13 @@
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/environs/storage"
-	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/utils/ssh"
 )
 
 type storageSuite struct {
-	coretesting.BaseSuite
+	testbase.LoggingSuite
 	bin string
 }
 
@@ -56,7 +56,7 @@
 var flockBin string
 
 func (s *storageSuite) SetUpSuite(c *gc.C) {
-	s.BaseSuite.SetUpSuite(c)
+	s.LoggingSuite.SetUpSuite(c)
 
 	var err error
 	flockBin, err = exec.LookPath("flock")

=== modified file 'environs/storage/storage_test.go'
--- environs/storage/storage_test.go	2014-05-16 01:33:13 +0000
+++ environs/storage/storage_test.go	2014-05-22 14:33:28 +0000
@@ -27,7 +27,7 @@
 var _ = gc.Suite(&datasourceSuite{})
 
 type datasourceSuite struct {
-	testing.FakeJujuHomeSuite
+	home    *testing.FakeHome
 	stor    storage.Storage
 	baseURL string
 }
@@ -41,8 +41,7 @@
 `
 
 func (s *datasourceSuite) SetUpTest(c *gc.C) {
-	s.FakeJujuHomeSuite.SetUpTest(c)
-	testing.WriteEnvironments(c, existingEnv)
+	s.home = testing.MakeFakeHome(c, existingEnv, "existing")
 	environ, err := environs.PrepareFromName("test", testing.Context(c), configstore.NewMem())
 	c.Assert(err, gc.IsNil)
 	s.stor = environ.Storage()
@@ -52,7 +51,7 @@
 
 func (s *datasourceSuite) TearDownTest(c *gc.C) {
 	dummy.Reset()
-	s.FakeJujuHomeSuite.TearDownTest(c)
+	s.home.Restore()
 }
 
 func (s *datasourceSuite) TestFetch(c *gc.C) {

=== modified file 'environs/sync/sync_test.go'
--- environs/sync/sync_test.go	2014-05-20 00:01:25 +0000
+++ environs/sync/sync_test.go	2014-05-22 14:33:28 +0000
@@ -40,7 +40,7 @@
 }
 
 type syncSuite struct {
-	coretesting.FakeJujuHomeSuite
+	testbase.LoggingSuite
 	envtesting.ToolsFixture
 	targetEnv    environs.Environ
 	origVersion  version.Binary
@@ -53,21 +53,21 @@
 var _ = gc.Suite(&badBuildSuite{})
 
 func (s *syncSuite) setUpTest(c *gc.C) {
-	s.FakeJujuHomeSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	s.ToolsFixture.SetUpTest(c)
 	s.origVersion = version.Current
 	// It's important that this be v1.8.x to match the test data.
 	version.Current.Number = version.MustParse("1.8.3")
 
 	// Create a target environments.yaml.
-	envConfig := `
+	fakeHome := coretesting.MakeFakeHome(c, `
 environments:
     test-target:
         type: dummy
         state-server: false
         authorized-keys: "not-really-one"
-`
-	coretesting.WriteEnvironments(c, envConfig)
+`)
+	s.AddCleanup(func(*gc.C) { fakeHome.Restore() })
 	var err error
 	s.targetEnv, err = environs.PrepareFromName("test-target", coretesting.Context(c), configstore.NewMem())
 	c.Assert(err, gc.IsNil)
@@ -100,7 +100,7 @@
 	dummy.Reset()
 	version.Current = s.origVersion
 	s.ToolsFixture.TearDownTest(c)
-	s.FakeJujuHomeSuite.TearDownTest(c)
+	s.LoggingSuite.TearDownTest(c)
 }
 
 var tests = []struct {
@@ -255,12 +255,12 @@
 
 type uploadSuite struct {
 	env environs.Environ
-	coretesting.FakeJujuHomeSuite
+	testbase.LoggingSuite
 	envtesting.ToolsFixture
 }
 
 func (s *uploadSuite) SetUpTest(c *gc.C) {
-	s.FakeJujuHomeSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	s.ToolsFixture.SetUpTest(c)
 	// We only want to use simplestreams to find any synced tools.
 	cfg, err := config.New(config.NoDefaults, dummy.SampleConfig())
@@ -272,7 +272,7 @@
 func (s *uploadSuite) TearDownTest(c *gc.C) {
 	dummy.Reset()
 	s.ToolsFixture.TearDownTest(c)
-	s.FakeJujuHomeSuite.TearDownTest(c)
+	s.LoggingSuite.TearDownTest(c)
 }
 
 func (s *uploadSuite) TestUpload(c *gc.C) {

=== modified file 'environs/testing/tools.go'
--- environs/testing/tools.go	2014-05-19 06:06:35 +0000
+++ environs/testing/tools.go	2014-05-22 14:33:28 +0000
@@ -30,11 +30,6 @@
 type ToolsFixture struct {
 	origDefaultURL string
 	DefaultBaseURL string
-
-	// UploadArches holds the architectures of tools to
-	// upload in UploadFakeTools. If empty, it will default
-	// to just version.Current.Arch.
-	UploadArches []string
 }
 
 func (s *ToolsFixture) SetUpTest(c *gc.C) {
@@ -46,26 +41,6 @@
 	envtools.DefaultBaseURL = s.origDefaultURL
 }
 
-// UploadFakeTools uploads fake tools of the architectures in
-// s.UploadArches for each LTS release to the specified storage.
-func (s *ToolsFixture) UploadFakeTools(c *gc.C, stor storage.Storage) {
-	arches := s.UploadArches
-	if len(arches) == 0 {
-		arches = []string{version.Current.Arch}
-	}
-	var versions []version.Binary
-	for _, arch := range arches {
-		v := version.Current
-		v.Arch = arch
-		for _, series := range bootstrap.ToolsLtsSeries {
-			v.Series = series
-			versions = append(versions, v)
-		}
-	}
-	_, err := UploadFakeToolsVersions(stor, versions...)
-	c.Assert(err, gc.IsNil)
-}
-
 // RemoveFakeToolsMetadata deletes the fake simplestreams tools metadata from the supplied storage.
 func RemoveFakeToolsMetadata(c *gc.C, stor storage.Storage) {
 	files := []string{simplestreams.UnsignedIndex, envtools.ProductMetadataPath}

=== modified file 'environs/tools/build_test.go'
--- environs/tools/build_test.go	2014-05-20 04:27:02 +0000
+++ environs/tools/build_test.go	2014-05-22 14:33:28 +0000
@@ -12,11 +12,11 @@
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/environs/tools"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type buildSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 	restore  func()
 	cwd      string
 	filePath string
@@ -25,7 +25,7 @@
 var _ = gc.Suite(&buildSuite{})
 
 func (b *buildSuite) SetUpTest(c *gc.C) {
-	b.BaseSuite.SetUpTest(c)
+	b.LoggingSuite.SetUpTest(c)
 
 	dir1 := c.MkDir()
 	dir2 := c.MkDir()
@@ -59,7 +59,7 @@
 
 func (b *buildSuite) TearDownTest(c *gc.C) {
 	b.restore()
-	b.BaseSuite.TearDownTest(c)
+	b.LoggingSuite.TearDownTest(c)
 }
 
 func (b *buildSuite) TestFindExecutable(c *gc.C) {

=== modified file 'environs/tools/storage_test.go'
--- environs/tools/storage_test.go	2014-05-20 04:27:02 +0000
+++ environs/tools/storage_test.go	2014-05-22 14:33:28 +0000
@@ -13,21 +13,21 @@
 	envtools "launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/provider/dummy"
 	"launchpad.net/juju-core/testing"
-	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
 
 type StorageSuite struct {
 	env environs.Environ
-	coretesting.BaseSuite
+	testbase.LoggingSuite
 	dataDir string
 }
 
 var _ = gc.Suite(&StorageSuite{})
 
 func (s *StorageSuite) SetUpTest(c *gc.C) {
-	s.BaseSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	cfg, err := config.New(config.NoDefaults, dummy.SampleConfig())
 	c.Assert(err, gc.IsNil)
 	s.env, err = environs.Prepare(cfg, testing.Context(c), configstore.NewMem())
@@ -37,7 +37,7 @@
 
 func (s *StorageSuite) TearDownTest(c *gc.C) {
 	dummy.Reset()
-	s.BaseSuite.TearDownTest(c)
+	s.LoggingSuite.TearDownTest(c)
 }
 
 func (s *StorageSuite) TestStorageName(c *gc.C) {

=== modified file 'environs/tools/tools_test.go'
--- environs/tools/tools_test.go	2014-05-21 22:15:10 +0000
+++ environs/tools/tools_test.go	2014-05-22 14:33:28 +0000
@@ -21,14 +21,14 @@
 	toolstesting "launchpad.net/juju-core/environs/tools/testing"
 	"launchpad.net/juju-core/provider/dummy"
 	"launchpad.net/juju-core/testing"
-	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
 
 type SimpleStreamsToolsSuite struct {
 	env environs.Environ
-	coretesting.BaseSuite
+	testbase.LoggingSuite
 	envtesting.ToolsFixture
 	origCurrentVersion version.Binary
 	customToolsDir     string
@@ -40,14 +40,14 @@
 }
 
 func (s *SimpleStreamsToolsSuite) SetUpSuite(c *gc.C) {
-	s.BaseSuite.SetUpSuite(c)
+	s.LoggingSuite.SetUpSuite(c)
 	s.customToolsDir = c.MkDir()
 	s.publicToolsDir = c.MkDir()
 }
 
 func (s *SimpleStreamsToolsSuite) SetUpTest(c *gc.C) {
 	s.ToolsFixture.DefaultBaseURL = "file://" + s.publicToolsDir
-	s.BaseSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	s.ToolsFixture.SetUpTest(c)
 	s.origCurrentVersion = version.Current
 	s.reset(c, nil)
@@ -57,7 +57,7 @@
 	dummy.Reset()
 	version.Current = s.origCurrentVersion
 	s.ToolsFixture.TearDownTest(c)
-	s.BaseSuite.TearDownTest(c)
+	s.LoggingSuite.TearDownTest(c)
 }
 
 func (s *SimpleStreamsToolsSuite) reset(c *gc.C, attrs map[string]interface{}) {

=== modified file 'environs/tools/urls_test.go'
--- environs/tools/urls_test.go	2014-05-15 05:14:01 +0000
+++ environs/tools/urls_test.go	2014-05-22 14:33:28 +0000
@@ -17,18 +17,21 @@
 	"launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/provider/dummy"
 	"launchpad.net/juju-core/testing"
-	coretesting "launchpad.net/juju-core/testing"
 )
 
 type URLsSuite struct {
-	coretesting.BaseSuite
+	home *testing.FakeHome
 }
 
 var _ = gc.Suite(&URLsSuite{})
 
+func (s *URLsSuite) SetUpTest(c *gc.C) {
+	s.home = testing.MakeEmptyFakeHome(c)
+}
+
 func (s *URLsSuite) TearDownTest(c *gc.C) {
+	s.home.Restore()
 	dummy.Reset()
-	s.BaseSuite.TearDownTest(c)
 }
 
 func (s *URLsSuite) env(c *gc.C, toolsMetadataURL string) environs.Environ {

=== modified file 'environs/tools/validation_test.go'
--- environs/tools/validation_test.go	2014-05-20 04:27:02 +0000
+++ environs/tools/validation_test.go	2014-05-22 14:33:28 +0000
@@ -10,12 +10,12 @@
 
 	"launchpad.net/juju-core/environs/filestorage"
 	"launchpad.net/juju-core/environs/simplestreams"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils"
 )
 
 type ValidateSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 	metadataDir string
 }
 
@@ -40,7 +40,7 @@
 }
 
 func (s *ValidateSuite) SetUpTest(c *gc.C) {
-	s.BaseSuite.SetUpTest(c)
+	s.LoggingSuite.SetUpTest(c)
 	s.metadataDir = c.MkDir()
 }
 

=== modified file 'instance/address_test.go'
--- instance/address_test.go	2014-05-20 04:27:02 +0000
+++ instance/address_test.go	2014-05-22 14:33:28 +0000
@@ -7,11 +7,11 @@
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type AddressSuite struct {
-	testing.BaseSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&AddressSuite{})

=== modified file 'juju/apiconn_test.go'
--- juju/apiconn_test.go	2014-05-16 01:33:13 +0000
+++ juju/apiconn_test.go	2014-05-22 14:33:28 +0000
@@ -23,24 +23,25 @@
 	"launchpad.net/juju-core/provider/dummy"
 	"launchpad.net/juju-core/state/api"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type NewAPIConnSuite struct {
-	coretesting.FakeJujuHomeSuite
+	testbase.LoggingSuite
 	envtesting.ToolsFixture
 }
 
 var _ = gc.Suite(&NewAPIConnSuite{})
 
 func (cs *NewAPIConnSuite) SetUpTest(c *gc.C) {
-	cs.FakeJujuHomeSuite.SetUpTest(c)
+	cs.LoggingSuite.SetUpTest(c)
 	cs.ToolsFixture.SetUpTest(c)
 }
 
 func (cs *NewAPIConnSuite) TearDownTest(c *gc.C) {
 	dummy.Reset()
 	cs.ToolsFixture.TearDownTest(c)
-	cs.FakeJujuHomeSuite.TearDownTest(c)
+	cs.LoggingSuite.TearDownTest(c)
 }
 
 func (*NewAPIConnSuite) TestNewConn(c *gc.C) {
@@ -75,18 +76,18 @@
 }
 
 type NewAPIClientSuite struct {
-	coretesting.FakeJujuHomeSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&NewAPIClientSuite{})
 
 func (cs *NewAPIClientSuite) TearDownTest(c *gc.C) {
 	dummy.Reset()
-	cs.FakeJujuHomeSuite.TearDownTest(c)
+	cs.LoggingSuite.TearDownTest(c)
 }
 
 func (s *NewAPIClientSuite) TestNameDefault(c *gc.C) {
-	coretesting.WriteEnvironments(c, coretesting.MultipleEnvConfig)
+	defer coretesting.MakeMultipleEnvHome(c).Restore()
 	// The connection logic should not delay the config connection
 	// at all when there is no environment info available.
 	// Make sure of that by providing a suitably long delay
@@ -106,7 +107,7 @@
 }
 
 func (*NewAPIClientSuite) TestNameNotDefault(c *gc.C) {
-	coretesting.WriteEnvironments(c, coretesting.MultipleEnvConfig)
+	defer coretesting.MakeMultipleEnvHome(c).Restore()
 	envName := coretesting.SampleCertName + "-2"
 	bootstrapEnv(c, envName, defaultConfigStore(c))
 	apiclient, err := juju.NewAPIClientFromName(envName)
@@ -116,6 +117,7 @@
 }
 
 func (s *NewAPIClientSuite) TestWithInfoOnly(c *gc.C) {
+	defer coretesting.MakeEmptyFakeHome(c).Restore()
 	store := newConfigStore("noconfig", dummyStoreInfo)
 
 	called := 0
@@ -155,7 +157,7 @@
 }
 
 func (s *NewAPIClientSuite) TestWithConfigAndNoInfo(c *gc.C) {
-	coretesting.MakeSampleJujuHome(c)
+	defer coretesting.MakeSampleHome(c).Restore()
 
 	store := newConfigStore(coretesting.SampleEnvName, &environInfo{
 		bootstrapConfig: map[string]interface{}{
@@ -208,6 +210,7 @@
 }
 
 func (s *NewAPIClientSuite) TestWithInfoError(c *gc.C) {
+	defer coretesting.MakeEmptyFakeHome(c).Restore()
 	expectErr := fmt.Errorf("an error")
 	store := newConfigStoreWithError(expectErr)
 	client, err := juju.NewAPIFromStore("noconfig", store, panicAPIOpen)
@@ -216,6 +219,7 @@
 }
 
 func (s *NewAPIClientSuite) TestWithInfoNoAddresses(c *gc.C) {
+	defer coretesting.MakeEmptyFakeHome(c).Restore()
 	store := newConfigStore("noconfig", &environInfo{
 		endpoint: configstore.APIEndpoint{
 			Addresses: []string{},
@@ -228,6 +232,7 @@
 }
 
 func (s *NewAPIClientSuite) TestWithInfoAPIOpenError(c *gc.C) {
+	defer coretesting.MakeEmptyFakeHome(c).Restore()
 	store := newConfigStore("noconfig", &environInfo{
 		endpoint: configstore.APIEndpoint{
 			Addresses: []string{"foo.invalid"},
@@ -244,7 +249,7 @@
 }
 
 func (s *NewAPIClientSuite) TestWithSlowInfoConnect(c *gc.C) {
-	coretesting.MakeSampleJujuHome(c)
+	defer coretesting.MakeSampleHome(c).Restore()
 	store := configstore.NewMem()
 	bootstrapEnv(c, coretesting.SampleEnvName, store)
 	setEndpointAddress(c, store, coretesting.SampleEnvName, "infoapi.invalid")
@@ -328,7 +333,7 @@
 }
 
 func (s *NewAPIClientSuite) TestWithSlowConfigConnect(c *gc.C) {
-	coretesting.MakeSampleJujuHome(c)
+	defer coretesting.MakeSampleHome(c).Restore()