diff --git a/Puppetfile b/Puppetfile
index 45722a0b5..449de5fb1 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -51,7 +51,7 @@ mod 'gluster',
   :git => 'https://github.com/purpleidea/puppet-gluster.git'
 
 mod 'gnocchi',
-  :commit => '135849d3f11592f6e6b1d4d86ac161a265ad3d28',
+  :commit => '4ebe8a6b83a5c3a55f7ea9f61991917054c6b013',
   :git => 'https://github.com/stackforge/puppet-gnocchi.git'
 
 mod 'haproxy',
diff --git a/gnocchi/.fixtures.yml b/gnocchi/.fixtures.yml
index fe0c152a8..2561c2fce 100644
--- a/gnocchi/.fixtures.yml
+++ b/gnocchi/.fixtures.yml
@@ -1,7 +1,9 @@
 fixtures:
   repositories:
     'inifile':  'git://github.com/puppetlabs/puppetlabs-inifile'
-    'concat': 'git://github.com/puppetlabs/puppetlabs-concat.git'
+    'concat':
+      'repo': 'git://github.com/puppetlabs/puppetlabs-concat.git'
+      'ref': '1.2.1'
     'keystone': 'git://github.com/stackforge/puppet-keystone.git'
     'mysql': 'git://github.com/puppetlabs/puppetlabs-mysql.git'
     'openstacklib': 'git://github.com/stackforge/puppet-openstacklib.git'
diff --git a/gnocchi/Gemfile b/gnocchi/Gemfile
index b0b2d45ff..b96ac8a14 100644
--- a/gnocchi/Gemfile
+++ b/gnocchi/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 group :development, :test do
   gem 'puppetlabs_spec_helper', :require => false
-  gem 'rspec-puppet', '~> 2.0.0', :require => false
+  gem 'rspec-puppet', '~> 2.1.0', :require => false
 
   gem 'metadata-json-lint'
   gem 'puppet-lint-param-docs'
diff --git a/gnocchi/manifests/db/mysql.pp b/gnocchi/manifests/db/mysql.pp
index c75fe10b9..fec7dbe47 100644
--- a/gnocchi/manifests/db/mysql.pp
+++ b/gnocchi/manifests/db/mysql.pp
@@ -47,7 +47,7 @@
 #
 # [*collate*]
 #   (optional) Charset collate of gnocchi database
-#   Defaults 'utf8_unicode_ci'.
+#   Defaults 'utf8_general_ci'.
 #
 class gnocchi::db::mysql(
   $password,
@@ -56,7 +56,7 @@
   $host          = '127.0.0.1',
   $allowed_hosts = undef,
   $charset       = 'utf8',
-  $collate       = 'utf8_unicode_ci',
+  $collate       = 'utf8_general_ci',
 ) {
 
   validate_string($password)
diff --git a/gnocchi/spec/classes/gnocchi_db_mysql_spec.rb b/gnocchi/spec/classes/gnocchi_db_mysql_spec.rb
index 6a616c6dc..f579df050 100644
--- a/gnocchi/spec/classes/gnocchi_db_mysql_spec.rb
+++ b/gnocchi/spec/classes/gnocchi_db_mysql_spec.rb
@@ -17,7 +17,7 @@
       :password      => 's3cr3t',
       :user          => 'gnocchi',
       :charset       => 'utf8',
-      :collate       => 'utf8_unicode_ci',
+      :collate       => 'utf8_general_ci',
       :host          => '127.0.0.1',
     }
   end
diff --git a/gnocchi/spec/classes/gnocchi_keystone_auth_spec.rb b/gnocchi/spec/classes/gnocchi_keystone_auth_spec.rb
index c17fbcd8b..ae9bcb7d8 100644
--- a/gnocchi/spec/classes/gnocchi_keystone_auth_spec.rb
+++ b/gnocchi/spec/classes/gnocchi_keystone_auth_spec.rb
@@ -23,7 +23,7 @@
 
     it { is_expected.to contain_keystone_user_role('gnocchi@foobar').with(
       :ensure  => 'present',
-      :roles   => 'admin'
+      :roles   => ['admin']
     )}
 
     it { is_expected.to contain_keystone_service('gnocchi').with(