diff --git a/.travis.yml b/.travis.yml
index 9970f594216..2c1b862c96d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ addons:
 
 rvm:
   - 2.6.2
-  - 2.5.3
+  - 2.5.4
   - 2.4.5
   - 2.3.8
 
@@ -51,7 +51,7 @@ jobs:
       script: rake rubocop
       stage: linting
     # Ruby 2.5, Rubygems 2.7
-    - rvm: 2.5.3
+    - rvm: 2.5.4
       env: RGV=v2.7.9
       stage: test
     # Ruby 2.4, Rubygems 2.6
diff --git a/Rakefile b/Rakefile
index ab8d981a6bf..687261120bb 100644
--- a/Rakefile
+++ b/Rakefile
@@ -71,8 +71,8 @@ namespace :spec do
       # Install the gems with a consistent version of RubyGems
       sh "gem update --system 3.0.3"
 
-      # Fix incorrect default etc gem specification file list on ruby 2.6.2.
-      if RUBY_VERSION == "2.6.2"
+      # Fix incorrect default etc gem specification file list on ruby 2.6.2 and 2.5.4
+      if RUBY_VERSION == "2.6.2" || RUBY_VERSION == "2.5.4"
         sh "gem install etc:1.0.1 --default"
       end