diff --git a/Gemfile b/Gemfile
index e60292f1..851fabc2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,2 @@
 source 'https://rubygems.org'
 gemspec
-
-
-platform :ruby do
-  gem "sqlite3"
-end
-
-platform :jruby do
-  gem "jdbc-sqlite3"
-  gem "activerecord-jdbcsqlite3-adapter"
-end
diff --git a/paper_trail.gemspec b/paper_trail.gemspec
index a24eedc9..f0d354aa 100644
--- a/paper_trail.gemspec
+++ b/paper_trail.gemspec
@@ -20,6 +20,11 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'shoulda', '~> 3.3'
-  s.add_development_dependency 'sqlite3', '~> 1.2' unless defined?(JRUBY_VERSION)
-  s.add_development_dependency 'ffaker',  '~> 2.0'
+  s.add_development_dependency 'ffaker',  '>= 1.15'
+  # JRuby support for the test ENV
+  unless defined?(JRUBY_VERSION)
+    s.add_development_dependency 'sqlite3', '~> 1.2'
+  else
+    s.add_development_dependency 'activerecord-jdbcsqlite3-adapter', '~> 1.2.9'
+  end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index d0a0e3c1..c37590bb 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,14 +1,5 @@
 # Configure Rails Envinronment
 ENV["RAILS_ENV"] = "test"
-require 'bundler/setup'
-
-if defined?(JRUBY_VERSION)
-  require 'jdbc/sqlite3'
-  require 'active_record'
-  require 'active_record/connection_adapters/jdbcsqlite3_adapter'
-else
-  require 'sqlite3'
-end
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"