diff --git a/Berksfile b/Berksfile
index f48a5b93..4f22319e 100644
--- a/Berksfile
+++ b/Berksfile
@@ -2,4 +2,4 @@ source 'https://supermarket.chef.io'
 
 metadata
 
-cookbook 'pdns_test', path: 'test/fixtures/cookbooks/pdns_test'
+cookbook 'pdns_test', path: 'test/cookbooks/pdns_test'
diff --git a/README.md b/README.md
index a00b8b72..ef2fc0ca 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ IMPORTANT: Please read the Compatibility Notes version below since there is brea
 
 ## Usage
 
-Use the `pdns_recursor_install`, `pdns_recursor_config`, and `pdns_recursor_service` resources in your wrapper cookbooks to install, configure, and define PowerDNS recursors. Set the different properties on the resources according to your install and configuration needs. You can see a good example on this on `test/fixtures/cookbooks/pdns_test/recipes_recursor_install_single.rb`
+Use the `pdns_recursor_install`, `pdns_recursor_config`, and `pdns_recursor_service` resources in your wrapper cookbooks to install, configure, and define PowerDNS recursors. Set the different properties on the resources according to your install and configuration needs. You can see a good example on this on `test/cookbooks/pdns_test/recipes_recursor_install_single.rb`
 
 Some properties need to set consistently accross `pdns_recursor_config` and `pdns_recursor_service`. They will be noted in their specific sections with a (C). 
 
diff --git a/test/fixtures/cookbooks/pdns_test/README.md b/test/cookbooks/pdns_test/README.md
similarity index 100%
rename from test/fixtures/cookbooks/pdns_test/README.md
rename to test/cookbooks/pdns_test/README.md
diff --git a/test/fixtures/cookbooks/pdns_test/libraries/helpers.rb b/test/cookbooks/pdns_test/libraries/helpers.rb
similarity index 100%
rename from test/fixtures/cookbooks/pdns_test/libraries/helpers.rb
rename to test/cookbooks/pdns_test/libraries/helpers.rb
diff --git a/test/fixtures/cookbooks/pdns_test/metadata.rb b/test/cookbooks/pdns_test/metadata.rb
similarity index 74%
rename from test/fixtures/cookbooks/pdns_test/metadata.rb
rename to test/cookbooks/pdns_test/metadata.rb
index 41ca6ac8..53c6a55d 100644
--- a/test/fixtures/cookbooks/pdns_test/metadata.rb
+++ b/test/cookbooks/pdns_test/metadata.rb
@@ -2,7 +2,7 @@
 maintainer       'Aetrion, LLC DBA DNSimple'
 maintainer_email 'support@dnsimple.com'
 license          'Apache 2.0'
-description      'A test fixture cookbook for the pdns cookbook'
+description      'A test cookbook for the pdns cookbook'
 version          '0.0.1'
 
 depends 'pdns'
diff --git a/test/fixtures/cookbooks/pdns_test/recipes/recursor_install_multi.rb b/test/cookbooks/pdns_test/recipes/recursor_install_multi.rb
similarity index 100%
rename from test/fixtures/cookbooks/pdns_test/recipes/recursor_install_multi.rb
rename to test/cookbooks/pdns_test/recipes/recursor_install_multi.rb
diff --git a/test/fixtures/cookbooks/pdns_test/recipes/recursor_install_single.rb b/test/cookbooks/pdns_test/recipes/recursor_install_single.rb
similarity index 100%
rename from test/fixtures/cookbooks/pdns_test/recipes/recursor_install_single.rb
rename to test/cookbooks/pdns_test/recipes/recursor_install_single.rb
diff --git a/test/fixtures/cookbooks/pdns_test/recipes/recursor_remove.rb b/test/cookbooks/pdns_test/recipes/recursor_remove.rb
similarity index 100%
rename from test/fixtures/cookbooks/pdns_test/recipes/recursor_remove.rb
rename to test/cookbooks/pdns_test/recipes/recursor_remove.rb