diff --git a/Makefile b/Makefile
index bb4e7b58..e312fd81 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,8 @@ bin/charm_helpers_sync.py:
 			> bin/charm_helpers_sync.py
 
 sync: bin/charm_helpers_sync.py
-	@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-sync.yaml
+	@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml
+	@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
 
 publish: lint
 	bzr push lp:charms/ceph-radosgw
diff --git a/charm-helpers-sync.yaml b/charm-helpers-hooks.yaml
similarity index 100%
rename from charm-helpers-sync.yaml
rename to charm-helpers-hooks.yaml
diff --git a/charm-helpers-tests.yaml b/charm-helpers-tests.yaml
new file mode 100644
index 00000000..48b12f6f
--- /dev/null
+++ b/charm-helpers-tests.yaml
@@ -0,0 +1,5 @@
+branch: lp:charm-helpers
+destination: tests/charmhelpers
+include:
+    - contrib.amulet
+    - contrib.openstack.amulet