diff --git a/.circleci/config.yml b/.circleci/config.yml
index 039268b9..67e7771b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -58,42 +58,34 @@
 
 version: 2
 jobs:
-  build-2-7-0:
+  build-3-0-1:
     <<: *dockerbuild
     docker:
-      - image: circleci/ruby:2.7.0
+      - image: circleci/ruby:3.0.1
         environment:
           BUNDLE_JOBS: "3"
           BUNDLE_RETRY: "3"
           BUNDLE_PATH: /home/circleci/project/vendor/bundle
-  build-2-6-3:
+  build-2-7-3:
     <<: *dockerbuild
     docker:
-      - image: circleci/ruby:2.6.3
+      - image: circleci/ruby:2.7.3
         environment:
           BUNDLE_JOBS: "3"
           BUNDLE_RETRY: "3"
           BUNDLE_PATH: /home/circleci/project/vendor/bundle
-  build-2-6-1:
-    <<: *dockerbuild
-    docker:
-      - image: circleci/ruby:2.6.1
-        environment:
-          BUNDLE_JOBS: "3"
-          BUNDLE_RETRY: "3"
-          BUNDLE_PATH: vendor/bundle
-  build-2-5-3:
+  build-2-6-7:
     <<: *dockerbuild
     docker:
-      - image: circleci/ruby:2.5.3
+      - image: circleci/ruby:2.6.7
         environment:
           BUNDLE_JOBS: "3"
           BUNDLE_RETRY: "3"
-          BUNDLE_PATH: vendor/bundle
-  build-2-4-5:
+          BUNDLE_PATH: /home/circleci/project/vendor/bundle
+  build-2-6-1:
     <<: *dockerbuild
     docker:
-      - image: circleci/ruby:2.4.5
+      - image: circleci/ruby:2.6.1
         environment:
           BUNDLE_JOBS: "3"
           BUNDLE_RETRY: "3"
@@ -103,8 +95,7 @@ workflows:
   version: 2
   test:
     jobs:
-      - build-2-7-0
-      - build-2-6-3
+      - build-3-0-1
+      - build-2-7-3
+      - build-2-6-7
       - build-2-6-1
-      - build-2-5-3
-      - build-2-4-5
diff --git a/.rubocop.yml b/.rubocop.yml
index 86ddb57e..7b4603c8 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -2,7 +2,7 @@ AllCops:
   Exclude:
     - "spec/**/*"
     - "vendor/**/*"
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6
 
 Layout:
   Enabled: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a7126c2..f91a5b45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,8 +13,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 
+- Dropped support for Ruby 2.4 and 2.5 as they are end of life.
+
 ### Added
 
+- Add Ruby 3.0.1 to test runs on CI.
+
 ## [0.12.0] - 2020-03-08
 
 ### Fixed
diff --git a/rufo.gemspec b/rufo.gemspec
index dc321767..2e75220a 100644
--- a/rufo.gemspec
+++ b/rufo.gemspec
@@ -20,12 +20,13 @@ Gem::Specification.new do |spec|
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.4.5"
+  spec.required_ruby_version = ">= 2.6.0"
 
   spec.add_development_dependency "bundler", ">= 1.15"
   spec.add_development_dependency "byebug", "~> 11.0.1"
   spec.add_development_dependency "guard-rspec", "~> 4.0"
   spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rexml", "~> 3.2.5"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec_junit_formatter", "~> 0.4.1"
   spec.add_development_dependency "rubocop", "~> 0.79.0"