diff --git a/.circleci/config.yml b/.circleci/config.yml
index 41832a0c8..becf26eb1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,7 +15,7 @@ rubocop: &rubocop
 jobs:
   confirm_config_and_documentation:
     docker:
-      - image: circleci/ruby:2.5
+      - image: circleci/ruby
     steps:
       - checkout
       - run: bundle install
@@ -61,6 +61,16 @@ jobs:
       - image: circleci/ruby:2.5
     <<: *rubocop
 
+  # Ruby 2.6
+  ruby-2.6-rspec:
+    docker:
+      - image: circleci/ruby:2.6
+    <<: *rspec
+  ruby-2.6-rubocop:
+    docker:
+      - image: circleci/ruby:2.6
+    <<: *rubocop
+
   # JRuby
   jruby:
     docker:
@@ -82,7 +92,7 @@ jobs:
 
   code-climate:
     docker:
-      - image: circleci/ruby:2.5
+      - image: circleci/ruby
     steps:
       - checkout
       - run: bundle install
@@ -121,5 +131,9 @@ workflows:
           requires: [confirm_config_and_documentation]
       - ruby-2.5-rubocop:
           requires: [confirm_config_and_documentation]
+      - ruby-2.6-rspec:
+          requires: [confirm_config_and_documentation]
+      - ruby-2.6-rubocop:
+          requires: [confirm_config_and_documentation]
       - jruby
       - code-climate