diff --git a/.travis.yml b/.travis.yml
index cbf6f11..c667d4d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@
 sudo: false
 language: ruby
 bundler_args: --without system_tests
-script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
+script: "bundle exec rake validate lint spec SPEC_OPTS='--format documentation'"
 matrix:
   fast_finish: true
   include:
@@ -20,8 +20,5 @@ matrix:
     env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
   - rvm: 1.8.7
     env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-  allow_failures:
-    - rvm: 2.1.6
-      env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
 notifications:
   email: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89d2fe8..b3e113f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+##2015-07-23 - Supported Release 3.5.0
+###Summary
+A small release to add explicit support to newer Puppet versions and accumulated patches.
+
+####Features/Improvements
+- Start running tests against puppet 4
+- Support longer usernames on newer MariaDB versions
+- Add parameters for Solaris 11 and 12
+
+####Bugfixes
+- Fix references to the mysql-server package
+- mysql_server_id doesn't throw and error on machines without macaddress
+
 ##2015-05-19 - Supported Release 3.4.0
 ###Summary
 This release includes the addition of extra facts, OpenBSD compatibility, and a number of other features, improvements and bug fixes.
@@ -104,7 +117,7 @@ Added several new features including MariaDB support and future parser
 * `mysql::db` now has an import\_timeout feature that defaults to 300
 * The `mysql` class has been removed
 * `mysql::server` now takes an `override_options` hash that will affect the installation
-* Ability to install both dev and client dev 
+* Ability to install both dev and client dev
 
 ####BugFix
 * `mysql::server::backup` now passes `ensure` param to the nested `mysql_grant`
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f1cbde4..bfeaa70 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -159,7 +159,7 @@ If you already have those gems installed, make sure they are up-to-date:
 With all dependencies in place and up-to-date we can now run the tests:
 
 ```shell
-% rake spec
+% bundle exec rake spec
 ```
 
 This will execute all the [rspec tests](http://rspec-puppet.com/) tests
@@ -178,8 +178,8 @@ installed on your system.
 You can run them by issuing the following command
 
 ```shell
-% rake spec_clean
-% rspec spec/acceptance
+% bundle exec rake spec_clean
+% bundle exec rspec spec/acceptance
 ```
 
 This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml),
diff --git a/Gemfile b/Gemfile
index bfe64b1..1a88250 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 def location_for(place, fake_version = nil)
-  if place =~ /^(git:[^#]*)#(.*)/
+  if place =~ /^(git[:@][^#]*)#(.*)/
     [fake_version, { :git => $1, :branch => $2, :require => false }].compact
   elsif place =~ /^file:\/\/(.*)/
     ['>= 0', { :path => File.expand_path($1), :require => false }]
@@ -16,6 +16,7 @@ group :development, :unit_tests do
   gem 'simplecov',               :require => false
   gem 'puppet_facts',            :require => false
   gem 'json',                    :require => false
+  gem 'metadata-json-lint',      :require => false
 end
 
 group :system_tests do
@@ -27,8 +28,8 @@ group :system_tests do
   else
     gem 'beaker-rspec',  :require => false
   end
-  gem 'serverspec',    :require => false
-  gem 'beaker-puppet_install_helper', :require => false
+  gem 'serverspec',                    :require => false
+  gem 'beaker-puppet_install_helper',  :require => false
 end
 
 
diff --git a/metadata.json b/metadata.json
index c833924..2b78d8b 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-mysql",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "author": "Puppet Labs",
   "summary": "Installs, configures, and manages the MySQL service.",
   "license": "Apache-2.0",
@@ -74,11 +74,11 @@
   "requirements": [
     {
       "name": "pe",
-      "version_requirement": "3.x"
+      "version_requirement": ">= 3.7.0 < 2015.3.0"
     },
     {
       "name": "puppet",
-      "version_requirement": "3.x"
+      "version_requirement": ">= 3.0.0 < 5.0.0"
     }
   ],
   "description": "Mysql module",
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f3a260a..be79afe 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,9 +1,6 @@
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'puppet_facts'
 include PuppetFacts
-RSpec.configure do |c|
-  c.formatter = :documentation
-end
 
 # The default set of platforms to test again.
 ENV['UNIT_TEST_PLATFORMS'] = 'centos-6-x86_64 ubuntu-1404-x86_64'