diff --git a/.codeclimate.yml b/.codeclimate.yml
index 4f0c8a96..4390ba5a 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -1,4 +1,3 @@
----
 engines:
   duplication:
     enabled: true
@@ -17,5 +16,5 @@ ratings:
   - "**.rb"
 
 exclude_paths:
-- spec/
-- certs/
+- spec/**/*
+- certs/**/*
diff --git a/.travis.yml b/.travis.yml
index 68b3520f..a5d090e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,39 +1,26 @@
 sudo: false
 cache: bundler
 
-rvm:
-  - 2.0.0
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
-  - 2.4.0
-
 env:
-  - "RAILS_VERSION=3.2.0"
-  - "RAILS_VERSION=4.0.0"
-  - "RAILS_VERSION=4.1.0"
-  - "RAILS_VERSION=4.2.0"
-  - "RAILS_VERSION=5.0.0"
-  - "RAILS_VERSION=5.1.0"
+  global:
+    - CC_TEST_REPORTER_ID=8792cbc0d1780830ddd3dd7eb1c25f09f386ba8f04449ad830039469406a6ab3
+    - GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct; else git log -1 --skip 1 --pretty=format:%ct; fi)
+  matrix:
+    - RAILS_VERSION=5.0.5
+    - RAILS_VERSION=5.1.3
 
-matrix:
-  exclude:
-    - rvm: 2.0.0
-      env: "RAILS_VERSION=5.0.0"
-    - rvm: 2.1.10
-      env: "RAILS_VERSION=5.0.0"
-    - rvm: 2.0.0
-      env: "RAILS_VERSION=5.1.0"
-    - rvm: 2.1.10
-      env: "RAILS_VERSION=5.1.0"
+rvm:
+  - 2.2
+  - 2.3
+  - 2.4
 
 notifications:
   recipients:
     - kpumuk@kpumuk.info
 
-addons:
-  code_climate:
-    repo_token: "8792cbc0d1780830ddd3dd7eb1c25f09f386ba8f04449ad830039469406a6ab3"
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
 
-after_success:
-  - bundle exec codeclimate-test-reporter
+after_script:
+  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT --coverage-input-type clover || true; fi
diff --git a/Gemfile b/Gemfile
index 43c103c4..1a00ffca 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,5 +13,4 @@ end
 
 group :test do
   gem 'simplecov'
-  gem 'codeclimate-test-reporter', '~> 1.0.0'
 end