diff --git a/cookbooks/cwb-server/DEVELOPMENT.md b/cookbooks/cwb-server/DEVELOPMENT.md
index a9db604..51c401a 100644
--- a/cookbooks/cwb-server/DEVELOPMENT.md
+++ b/cookbooks/cwb-server/DEVELOPMENT.md
@@ -24,6 +24,10 @@ make syntax
 
 ## Testing
 
+> This feature is currently broken in mono-repos\
+> See https://github.com/chef/delivery-cli/issues/47
+> Workaround: Use Makefile targets instead
+
 This cookbook uses (Chef Delivery Local)[https://docs.chef.io/delivery_cli.html#delivery-local] to automate testing stages.
 
 Run all tests:
diff --git a/cookbooks/cwb-server/Makefile b/cookbooks/cwb-server/Makefile
index 2baf85f..7aa4521 100644
--- a/cookbooks/cwb-server/Makefile
+++ b/cookbooks/cwb-server/Makefile
@@ -1,4 +1,4 @@
-.PHONY: install outdated test lint vendor
+.PHONY: install outdated test integration_test unit_test lint syntax all_tests vendor
 
 install:
 	berks install
@@ -6,20 +6,21 @@ install:
 outdated:
 	berks outdated
 
-test:
-	kitchen verify
+test: integration_test
 
 integration_test:
-	kitchen test
+	kitchen verify
 
 unit_test:
-	delivery local unit
+	chef exec rspec spec/
 
 lint:
-	delivery local lint
+	chef exec cookstyle
 
 syntax:
-	delivery local syntax
+	chef exec foodcritic . --exclude spec -f any # -t \"~FC064\" -t \"~FC065\"
+
+all_tests: lint syntax unit_test integration_test
 
 vendor: install
 	./vendor_berks_cookbooks.sh