diff --git a/Gemfile b/Gemfile
index 8c9dff2..86ccb32 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,56 +1,58 @@
-source "https://rubygems.org"
-# TODO: move these to the gemspec...
-
-group :development, :test do
-  gem "rake"
-  gem "ruby-debug", :platform => :ruby_18
-  gem "ruby-debug19", :platform => :ruby_19
-  gem "bundler"
-
-  gem "json_pure"
-
-  gem "activerecord-mysql2-adapter"
-  #ORM's
-  gem "activerecord"
-  gem "datamapper"
-  gem "dm-migrations"
-  gem "dm-sqlite-adapter"
-  gem "mongoid"
-  gem "tzinfo"
-  gem "mongo_ext"
-  gem "bson_ext"
-  gem "mongoid-tree"
-
-  gem "mongo_mapper"
-  gem "moped"
-  gem "neo4j-core"
-  gem "couch_potato"
-
-  gem "sequel", "~> 3.21.0"
-  #gem "ibm_db"  # I don't want to add this dependency, even as a dev one since it requires DB2 to be installed
-  gem 'mysql', '~> 2.9.1'
-  gem 'mysql2'
-  gem 'pg'
-  gem 'ohm', '~> 0.1.3'
-
-  gem 'guard-rspec'
-end
-
-group :test do
-  gem "rspec-rails"
-  gem "sqlite3"
-end
-
-group :cucumber do
-  gem "cucumber"
-end
-
-platforms :mri_18 do
-  gem 'sqlite3-ruby', :group => :cucumber
-  #gem 'mysql', :group => :development
-end
-
-platforms :mri_19 do
-  gem 'sqlite3', :group => :cucumber
-  #gem 'mysql2', :group => :development
-end
+gemspec
+#
+# source "https://rubygems.org"
+# # TODO: move these to the gemspec...
+#
+# group :development, :test do
+#   gem "rake"
+#   gem "ruby-debug", :platform => :ruby_18
+#   gem "ruby-debug19", :platform => :ruby_19
+#   gem "bundler"
+#
+#   gem "json_pure"
+#
+#   gem "activerecord-mysql2-adapter"
+#   #ORM's
+#   gem "activerecord"
+#   gem "datamapper"
+#   gem "dm-migrations"
+#   gem "dm-sqlite-adapter"
+#   gem "mongoid"
+#   gem "tzinfo"
+#   gem "mongo_ext"
+#   gem "bson_ext"
+#   gem "mongoid-tree"
+#
+#   gem "mongo_mapper"
+#   gem "moped"
+#   gem "neo4j-core"
+#   gem "couch_potato"
+#
+#   gem "sequel", "~> 3.21.0"
+#   #gem "ibm_db"  # I don't want to add this dependency, even as a dev one since it requires DB2 to be installed
+#   gem 'mysql', '~> 2.9.1'
+#   gem 'mysql2'
+#   gem 'pg'
+#   gem 'ohm', '~> 0.1.3'
+#
+#   gem 'guard-rspec'
+# end
+#
+# group :test do
+#   gem "rspec-rails"
+#   gem "sqlite3"
+# end
+#
+# group :cucumber do
+#   gem "cucumber"
+# end
+#
+# platforms :mri_18 do
+#   gem 'sqlite3-ruby', :group => :cucumber
+#   #gem 'mysql', :group => :development
+# end
+#
+# platforms :mri_19 do
+#   gem 'sqlite3', :group => :cucumber
+#   #gem 'mysql2', :group => :development
+# end
diff --git a/Gemfile.lock b/Gemfile.lock
index 1c5c6d3..9801d9a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,8 @@
+PATH
+  remote: .
+  specs:
+    database_cleaner (1.4.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -25,7 +30,6 @@ GEM
       mysql2
     activesupport (3.0.0)
     addressable (2.3.6)
-    archive-tar-minitar (0.5.2)
     arel (1.0.1)
       activesupport (~> 3.0.0)
     bcrypt (3.1.7)
@@ -40,7 +44,6 @@ GEM
       bson (~> 1.11.1)
     builder (2.1.2)
     coderay (1.1.0)
-    columnize (0.8.9)
     couch_potato (1.3.0)
       activemodel
       couchrest (~> 1.2.0)
@@ -134,10 +137,6 @@ GEM
     json (1.8.1)
     json (1.8.1-java)
     json_pure (1.8.1)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
     listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -210,7 +209,6 @@ GEM
       ffi (>= 0.5.0)
     rb-kqueue (0.2.3)
       ffi (>= 0.5.0)
-    rbx-require-relative (0.0.9)
     rdoc (4.1.2)
       json (~> 1.4)
     redis (3.1.0)
@@ -230,28 +228,11 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.11.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
     sequel (3.21.0)
     slop (3.6.0)
     spoon (0.0.4)
       ffi
     sqlite3 (1.3.9)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
     stringex (1.5.1)
     thor (0.14.6)
     tzinfo (0.3.41)
@@ -269,6 +250,7 @@ DEPENDENCIES
   bundler
   couch_potato
   cucumber
+  database_cleaner!
   datamapper
   dm-migrations
   dm-sqlite-adapter
@@ -285,10 +267,10 @@ DEPENDENCIES
   ohm (~> 0.1.3)
   pg
   rake
-  rspec-rails
-  ruby-debug
-  ruby-debug19
+  rspec-rails (~> 2.11.0)
   sequel (~> 3.21.0)
   sqlite3
-  sqlite3-ruby
   tzinfo
+
+BUNDLED WITH
+   1.10.5
diff --git a/database_cleaner.gemspec b/database_cleaner.gemspec
index a4671a2..0c731d4 100644
--- a/database_cleaner.gemspec
+++ b/database_cleaner.gemspec
@@ -1,5 +1,4 @@
 require 'yaml'
-
 version = YAML.load_file 'VERSION.yml'
 
 Gem::Specification.new do |s|
@@ -149,87 +148,36 @@ Gem::Specification.new do |s|
   s.rubygems_version = "2.4.5"
   s.summary = "Strategies for cleaning databases.  Can be used to ensure a clean state for testing."
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  s.add_development_dependency "rake"
+  s.add_development_dependency "bundler"
+  s.add_development_dependency "json_pure"
+  s.add_development_dependency "activerecord-mysql2-adapter" unless RUBY_PLATFORM =~ /java/
+  s.add_development_dependency "activerecord"
+  s.add_development_dependency "datamapper"
+  s.add_development_dependency "dm-migrations"
+  s.add_development_dependency "dm-sqlite-adapter"
+  s.add_development_dependency "mongoid"
+  s.add_development_dependency "tzinfo"
+  s.add_development_dependency "mongoid-tree"
+  s.add_development_dependency "mongo_mapper"
+  s.add_development_dependency "moped"
+  s.add_development_dependency "neo4j-core"
+  s.add_development_dependency "couch_potato"
+  s.add_development_dependency "sequel", "~> 3.21.0"
+  s.add_development_dependency 'ohm', '~> 0.1.3'
+  s.add_development_dependency 'guard-rspec'
+  s.add_development_dependency "rspec-rails", "~> 2.11.0"
+  s.add_development_dependency "cucumber"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<json_pure>, [">= 0"])
-      s.add_development_dependency(%q<activerecord-mysql2-adapter>, [">= 0"])
-      s.add_development_dependency(%q<activerecord>, [">= 0"])
-      s.add_development_dependency(%q<datamapper>, [">= 0"])
-      s.add_development_dependency(%q<dm-migrations>, [">= 0"])
-      s.add_development_dependency(%q<dm-sqlite-adapter>, [">= 0"])
-      s.add_development_dependency(%q<mongoid>, [">= 0"])
-      s.add_development_dependency(%q<tzinfo>, [">= 0"])
-      s.add_development_dependency(%q<mongo_ext>, [">= 0"])
-      s.add_development_dependency(%q<bson_ext>, [">= 0"])
-      s.add_development_dependency(%q<mongoid-tree>, [">= 0"])
-      s.add_development_dependency(%q<mongo_mapper>, [">= 0"])
-      s.add_development_dependency(%q<moped>, [">= 0"])
-      s.add_development_dependency(%q<neo4j-core>, [">= 0"])
-      s.add_development_dependency(%q<couch_potato>, [">= 0"])
-      s.add_development_dependency(%q<sequel>, ["~> 3.21.0"])
-      s.add_development_dependency(%q<mysql>, ["~> 2.8.1"])
-      s.add_development_dependency(%q<mysql2>, [">= 0"])
-      s.add_development_dependency(%q<pg>, [">= 0"])
-      s.add_development_dependency(%q<ohm>, ["~> 0.1.3"])
-      s.add_development_dependency(%q<guard-rspec>, [">= 0"])
-    else
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<ruby-debug19>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<json_pure>, [">= 0"])
-      s.add_dependency(%q<activerecord-mysql2-adapter>, [">= 0"])
-      s.add_dependency(%q<activerecord>, [">= 0"])
-      s.add_dependency(%q<datamapper>, [">= 0"])
-      s.add_dependency(%q<dm-migrations>, [">= 0"])
-      s.add_dependency(%q<dm-sqlite-adapter>, [">= 0"])
-      s.add_dependency(%q<mongoid>, [">= 0"])
-      s.add_dependency(%q<tzinfo>, [">= 0"])
-      s.add_dependency(%q<mongo_ext>, [">= 0"])
-      s.add_dependency(%q<bson_ext>, [">= 0"])
-      s.add_dependency(%q<mongoid-tree>, [">= 0"])
-      s.add_dependency(%q<mongo_mapper>, [">= 0"])
-      s.add_dependency(%q<moped>, [">= 0"])
-      s.add_dependency(%q<neo4j-core>, [">= 0"])
-      s.add_dependency(%q<couch_potato>, [">= 0"])
-      s.add_dependency(%q<sequel>, ["~> 3.21.0"])
-      s.add_dependency(%q<mysql>, ["~> 2.8.1"])
-      s.add_dependency(%q<mysql2>, [">= 0"])
-      s.add_dependency(%q<pg>, [">= 0"])
-      s.add_dependency(%q<ohm>, ["~> 0.1.3"])
-      s.add_dependency(%q<guard-rspec>, [">= 0"])
-    end
+  unless RUBY_PLATFORM =~ /java/
+    s.add_development_dependency "mongo_ext"
+    s.add_development_dependency "bson_ext"
+    s.add_development_dependency 'mysql', '~> 2.9.1'
+    s.add_development_dependency 'mysql2'
+    s.add_development_dependency 'pg'
+    s.add_development_dependency "sqlite3-ruby" if RUBY_VERSION < "1.9"
+    s.add_development_dependency "sqlite3" if RUBY_VERSION >= "1.9"
   else
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<ruby-debug19>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<json_pure>, [">= 0"])
-    s.add_dependency(%q<activerecord-mysql2-adapter>, [">= 0"])
-    s.add_dependency(%q<activerecord>, [">= 0"])
-    s.add_dependency(%q<datamapper>, [">= 0"])
-    s.add_dependency(%q<dm-migrations>, [">= 0"])
-    s.add_dependency(%q<dm-sqlite-adapter>, [">= 0"])
-    s.add_dependency(%q<mongoid>, [">= 0"])
-    s.add_dependency(%q<tzinfo>, [">= 0"])
-    s.add_dependency(%q<mongo_ext>, [">= 0"])
-    s.add_dependency(%q<bson_ext>, [">= 0"])
-    s.add_dependency(%q<mongoid-tree>, [">= 0"])
-    s.add_dependency(%q<mongo_mapper>, [">= 0"])
-    s.add_dependency(%q<moped>, [">= 0"])
-    s.add_dependency(%q<neo4j-core>, [">= 0"])
-    s.add_dependency(%q<couch_potato>, [">= 0"])
-    s.add_dependency(%q<sequel>, ["~> 3.21.0"])
-    s.add_dependency(%q<mysql>, ["~> 2.8.1"])
-    s.add_dependency(%q<mysql2>, [">= 0"])
-    s.add_dependency(%q<pg>, [">= 0"])
-    s.add_dependency(%q<ohm>, ["~> 0.1.3"])
-    s.add_dependency(%q<guard-rspec>, [">= 0"])
+    s.add_development_dependency "activerecord-jdbc-adapter"
   end
 end