diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 89ead1d..a02774d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,6 +10,9 @@ jobs:
         - ruby: 3.0
           gemfile: Gemfile
           elasticsearch: 7.12.1
+        - ruby: 3.0
+          gemfile: Gemfile
+          opensearch: 1
         - ruby: 2.7
           gemfile: gemfiles/activerecord60.gemfile
           elasticsearch: 7.12.1
@@ -40,11 +43,14 @@ jobs:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
     - run: bundle update
+
     - uses: actions/cache@v2
+      if: ${{ matrix.elasticsearch }}
       with:
         path: ~/elasticsearch
         key: ${{ runner.os }}-elasticsearch-${{ matrix.elasticsearch }}
     - uses: ankane/setup-elasticsearch@v1
+      if: ${{ matrix.elasticsearch }}
       with:
         elasticsearch-version: ${{ matrix.elasticsearch }}
         plugins: |
@@ -52,6 +58,17 @@ jobs:
           analysis-smartcn
           analysis-stempel
           analysis-ukrainian
+
+    - uses: actions/cache@v2
+      if: ${{ matrix.opensearch }}
+      with:
+        path: ~/opensearch
+        key: ${{ runner.os }}-opensearch-${{ matrix.opensearch }}
+    - uses: ankane/setup-opensearch@v1
+      if: ${{ matrix.opensearch }}
+      with:
+        opensearch-version: ${{ matrix.opensearch }}
+
     - uses: ankane/setup-mongodb@v1
       if: ${{ matrix.mongodb }}
     - run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 248626e..fc265d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.5.0 (unreleased)
+
+- Added experimental support for OpenSearch
+
 ## 4.4.4 (2021-03-12)
 
 - Fixed `too_long_frame_exception` with `scroll` method
diff --git a/test/language_test.rb b/test/language_test.rb
index ec9b7a3..3e4d121 100644
--- a/test/language_test.rb
+++ b/test/language_test.rb
@@ -3,6 +3,7 @@ require_relative "test_helper"
 class LanguageTest < Minitest::Test
   def setup
     skip "Requires plugin" unless ci? || ENV["TEST_LANGUAGE"]
+    skip "Requires Elasticsearch" if Searchkick.opensearch?
 
     Song.destroy_all
   end
--
libgit2 0.21.0