diff --git a/Makefile b/Makefile
index cc53a95..f207059 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,8 @@ lint:
 	@charm proof
 
 sync:
-	@charm-helper-sync -c charm-helpers-sync.yaml
+	@charm-helper-sync -c charm-helpers-hooks.yaml
+	@charm-helper-sync -c charm-helpers-tests.yaml
 
 publish: lint
 	bzr push lp:charms/ceph
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 0000000..48b12f6
--- /dev/null
+++ b/charm-helpers-tests.yaml
@@ -0,0 +1,5 @@
+branch: lp:charm-helpers
+destination: tests/charmhelpers
+include:
+    - contrib.amulet
+    - contrib.openstack.amulet