diff --git a/Gemfile b/Gemfile
index 63918d29..e7e41d73 100644
--- a/Gemfile
+++ b/Gemfile
@@ -54,7 +54,7 @@ group :test do
   gem 'sqlite3', platform: (@windows_platforms + [:ruby])
   platforms :jruby do
     if version == 'master' || version >= '5'
-      gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'rails-5'
+      gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' # github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
     else
       gem 'activerecord-jdbcsqlite3-adapter'
     end
diff --git a/appveyor.yml b/appveyor.yml
index 1da91102..1fc00990 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,11 +13,9 @@ cache:
 
 install:
   - SET PATH=C:\%ruby_version%\bin;%PATH%
-  - gem update --system
-  - gem uninstall bundler -a -x
-  - gem install bundler -v 1.13.7
   - bundle env
-  - bundle install --path=vendor/bundle --retry=3 --jobs=3
+  - bundle check || bundle install --path=vendor/bundle --retry=3 --jobs=3
+  - bundle clean --force
 
 before_test:
   - ruby -v
diff --git a/test/adapter/json_api/pagination_links_test.rb b/test/adapter/json_api/pagination_links_test.rb
index 3cdbab0e..07e71efb 100644
--- a/test/adapter/json_api/pagination_links_test.rb
+++ b/test/adapter/json_api/pagination_links_test.rb
@@ -183,10 +183,11 @@ module ActiveModelSerializers
         def test_raises_descriptive_error_when_serialization_context_unset
           render_options = { adapter: :json_api }
           adapter = serializable(using_kaminari, render_options)
-          exception = assert_raises do
+          exception_class = ActiveModelSerializers::Adapter::JsonApi::PaginationLinks::MissingSerializationContextError
+
+          exception = assert_raises(exception_class) do
             adapter.as_json
           end
-          exception_class = ActiveModelSerializers::Adapter::JsonApi::PaginationLinks::MissingSerializationContextError
           assert_equal exception_class, exception.class
           assert_match(/CollectionSerializer#paginated\?/, exception.message)
         end