diff --git a/Makefile b/Makefile
index 607af27a..ff5af136 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ lint:
 
 test:
 	@# Bundletester expects unit tests here.
-	@$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage unit_tests
+	@$(PYTHON) /usr/bin/nosetests -v --nologcapture --with-coverage unit_tests
 
 functional_test:
 	@echo Starting Amulet tests...
diff --git a/tests/00-setup b/tests/00-setup
index dd9158fd..94e5611f 100755
--- a/tests/00-setup
+++ b/tests/00-setup
@@ -4,11 +4,14 @@ set -ex
 
 sudo add-apt-repository --yes ppa:juju/stable
 sudo apt-get update --yes
-sudo apt-get install --yes python-amulet \
+sudo apt-get install --yes amulet \
+                           distro-info-data \
                            python-cinderclient \
                            python-distro-info \
                            python-glanceclient \
                            python-heatclient \
                            python-keystoneclient \
+                           python-neutronclient \
                            python-novaclient \
+                           python-pika \
                            python-swiftclient
diff --git a/tests/tests.yaml b/tests/tests.yaml
index db533a1e..64e3e2d1 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -8,11 +8,13 @@ sources:
     - ppa:juju/stable
 packages:
     - amulet
-    - python-amulet
+    - distro-info-data
     - python-cinderclient
     - python-distro-info
     - python-glanceclient
     - python-heatclient
     - python-keystoneclient
+    - python-neutronclient
     - python-novaclient
+    - python-pika
     - python-swiftclient