diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
index 227aace..6b935af 100644
--- a/.github/workflows/rubocop.yml
+++ b/.github/workflows/rubocop.yml
@@ -13,10 +13,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - name: Set up Ruby 2.6
+    - name: Set up Ruby 3.1
       uses: actions/setup-ruby@v1
       with:
-        ruby-version: 2.6.x
+        ruby-version: 3.1.x
     - name: Install required package
       run: |
         sudo apt-get install alien
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0dbff00..e8e1e0c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,10 +12,11 @@ jobs:
     strategy:
       matrix:
         ruby: [
-          3.0,
-          2.7,
-          2.6,
-          2.5,
+          '3.1',
+          '3.0',
+          '2.7',
+          '2.6',
+          '2.5',
           ruby-head,
           ruby-debug
         ]
diff --git a/Gemfile b/Gemfile
index f242676..e57697d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,7 @@
 source "http://rubygems.org"
 
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
 group :development do
   gem "juwelier", "~> 2.0"
   gem "rspec_junit_formatter"
@@ -19,6 +21,10 @@ group :test, :development do
   end
 
   platforms :ruby, :mswin, :mingw do
-    gem "ruby-oci8", "~> 2.1"
+    if RUBY_VERSION >= "3.2"
+      gem "ruby-oci8", github: "kubo/ruby-oci8", branch: "master"
+    else
+      gem "ruby-oci8", "~> 2.1"
+    end
   end
 end