diff --git a/Makefile b/Makefile
index 59eacf89..70107b3d 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,8 @@ lint:
 	@echo "OK"
 
 sync:
-	@charm-helper-sync -c charm-helpers.yaml
+	@charm-helper-sync -c charm-helpers-hooks.yaml
+	@charm-helper-sync -c charm-helpers-tests.yaml
 
 test:
 	@$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage  unit_tests
diff --git a/charm-helpers.yaml b/charm-helpers-hooks.yaml
similarity index 100%
rename from charm-helpers.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