diff --git a/.travis.yml b/.travis.yml
index a0768d5..a3fcfee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -67,5 +67,7 @@ rvm:
   - 2.4.7
   - 2.5.6
   - 2.6.5
+  - 2.7.1
+  - 3.0.0
 notifications:
   email: false
diff --git a/Appraisals b/Appraisals
index f7c6543..9956dea 100644
--- a/Appraisals
+++ b/Appraisals
@@ -17,7 +17,7 @@ if RUBY_VERSION <= "2.4.0"
     gem 'actionpack' , '4.2.7.1'
   end
 end
-if  RUBY_VERSION >= '2.2.0' && ENV['BUNDLER_VERSION'].to_s <= '2.0'
+if RUBY_VERSION >= '2.2.0' && RUBY_VERSION < '3.0.0' && ENV['BUNDLER_VERSION'].to_s <= '2.0'
   appraise "rails-5.0.0" do
     gem "rails", "5.0.0"
   end
@@ -40,7 +40,7 @@ if  RUBY_VERSION >= '2.2.0' && ENV['BUNDLER_VERSION'].to_s <= '2.0'
   end
 end
 
-if  RUBY_VERSION >= '2.2.0' && ENV['BUNDLER_VERSION'].to_s >= '2.0'
+if RUBY_VERSION >= '2.2.0' && RUBY_VERSION < '3.0.0' && ENV['BUNDLER_VERSION'].to_s >= '2.0'
   appraise "rails-5.2.0" do
     gem "rails", "5.2.0"
   end
@@ -57,3 +57,9 @@ if  RUBY_VERSION >= '2.2.0' && ENV['BUNDLER_VERSION'].to_s >= '2.0'
     gem "rails", "6.0.1"
   end
 end
+
+if RUBY_VERSION >= '3.0.0' && ENV['BUNDLER_VERSION'].to_s >= '2.0'
+  appraise "rails-6.1.3" do
+    gem "rails", "6.1.3"
+  end
+end
\ No newline at end of file
diff --git a/gemfiles/rails_6.1.3.gemfile b/gemfiles/rails_6.1.3.gemfile
new file mode 100644
index 0000000..98c6782
--- /dev/null
+++ b/gemfiles/rails_6.1.3.gemfile
@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "wash_out", git: "https://github.com/inossidabile/wash_out.git"
+gem "rails", "6.1.3"
+
+gemspec path: "../"
diff --git a/install-travis-bundler.sh b/install-travis-bundler.sh
index 70b0701..eff0d4b 100644
--- a/install-travis-bundler.sh
+++ b/install-travis-bundler.sh
@@ -11,8 +11,8 @@ echo "Trying to compare rails ${rails_version:="1"} with 5.2"
 if (( $(echo "${rails_version%.*} >= 5.2" |bc -l) )); then
    echo "Installing Bundler v2"
    gem uninstall -v '< 2.0' -i "$(rvm gemdir)"@global -ax bundler --force || true
-   gem install bundler -v '2.0.1'
-   export MY_BUNDLER_VERSION="_2.0.1_"
+   gem install bundler -v '2.2.11'
+   export MY_BUNDLER_VERSION="_2.2.11_"
 else
    echo "Installing Bundler v1"
    gem uninstall -v '>= 2' -i "$(rvm gemdir)"@global -ax bundler --force  || true
diff --git a/lib/washout_builder/version.rb b/lib/washout_builder/version.rb
index 8285123..26bfb9e 100644
--- a/lib/washout_builder/version.rb
+++ b/lib/washout_builder/version.rb
@@ -12,7 +12,7 @@ module VERSION
     # the minor version of the gem
     MINOR = 0
     # the tiny version of the gem
-    TINY = 3
+    TINY = 4
     # if the version should be a prerelease
     PRE = nil
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4b36cac..bc46bb3 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -154,3 +154,28 @@ def silence_stream(stream)
     old_stream.close
   end
 end
+
+# TODO: remove this when wasabi will update their code
+require 'uri'
+if !defined?(::URI.unescape)
+  ::URI.class_eval do
+    # this was removed in this commit
+    # https://github.com/ruby/uri/commit/61c6a47ebf1f2726b60a2bbd70964d64e14b1f98
+    # so we are adding it back because we need to be compatible with wasabi on ruby 3.0.0
+    module UriEscapeBackport
+
+      def escape(*arg)
+        ::URI::DEFAULT_PARSER.escape(*arg)
+      end
+
+      alias encode escape
+
+      def unescape(*arg)
+        ::URI::DEFAULT_PARSER.unescape(*arg)
+      end
+
+      alias decode unescape
+    end
+    extend UriEscapeBackport
+  end
+end
diff --git a/washout_builder.gemspec b/washout_builder.gemspec
index 75eb569..b94c813 100644
--- a/washout_builder.gemspec
+++ b/washout_builder.gemspec
@@ -21,13 +21,14 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'wash_out', '>= 0.9.1', '>= 0.9.1'
   s.add_runtime_dependency 'activesupport', '>= 4.0', '>= 4.0'
-  
-  s.add_development_dependency 'wasabi', '~> 3.5', '>= 3.5'
+
+  # wasabi >= 3.6.0 does not work well with savon
+  s.add_development_dependency 'wasabi', '< 3.6.0'
   s.add_development_dependency 'savon', '~> 2.11', '>= 2.11'
   s.add_development_dependency 'httpi', '~> 2.4', '>= 2.4'
   s.add_development_dependency 'nokogiri', '~> 1.7', '>= 1.7'
 
-  s.add_development_dependency 'rspec-rails','4.0.0.beta3'
+  s.add_development_dependency 'rspec-rails','4.0.2'
   s.add_development_dependency 'appraisal', '~> 2.1', '>= 2.1'
   s.add_development_dependency 'simplecov', '~> 0.12', '>= 0.12'
   s.add_development_dependency 'simplecov-summary', '~> 0.0.5', '>= 0.0.5'