diff --git a/Berksfile b/Berksfile
index 952c675..50acdd5 100644
--- a/Berksfile
+++ b/Berksfile
@@ -1,6 +1,8 @@
+source "https://supermarket.getchef.com"
+
 metadata
 
 cookbook "openstack-common",
-  git: "git://github.com/stackforge/cookbook-openstack-common.git"
+  github: "stackforge/cookbook-openstack-common"
 cookbook "openstack-identity",
-  git: "git://github.com/stackforge/cookbook-openstack-identity.git"
\ No newline at end of file
+  github: "stackforge/cookbook-openstack-identity"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a70a04e..c979ce4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ This file is used to list changes made in each version of the cookbook-openstack
 
 ## 10.0.0
 * Upgrading to Juno
+* Upgrading berkshelf from 2.0.18 to 3.1.5
 
 ## 9.0.1
 * Allow setting passwords via attributes by using the get_password method
diff --git a/Gemfile b/Gemfile
index 6c88a6d..f63ebd3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'chef', '~> 11.12.0'
 gem 'json', '<= 1.7.7' # chef 11 dependency
-gem 'berkshelf', '~> 2.0.18'
+gem 'berkshelf', '~> 3.1.5'
 gem 'hashie', '~> 2.0'
 gem 'chefspec', '~> 4.0.0'
 gem 'rspec', '~> 3.0.0'
diff --git a/TESTING.md b/TESTING.md
index 2b52f68..1ed6680 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -11,7 +11,7 @@ To run all of the tests with Strainer:
 Or you may run the tests individually:
 
     $ bundle install --path=.bundle # install gem dependencies
-    $ bundle exec berks install --path=.cookbooks # install cookbook dependencies
+    $ bundle exec berks vendor .cookbooks # install cookbook dependencies and create the folder .cookbooks
     $ bundle exec strainer test -s Strainerfile # run tests
 
 ## Rubocop  ##