diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 3b67d1da..5a31c35c 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -27,7 +27,8 @@ jobs:
       matrix:
         os:
         - ubuntu-latest
-        - macos-11
+        - macos-latest
+        - macos-arm-oss
         - windows-latest
         ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
         include:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ef6ba7cb..cd6f20b0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,12 +28,14 @@ jobs:
         os:
         - ubuntu-latest
         - macos-latest
+        - macos-arm-oss
         - windows-latest
         ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
         include:
         - { os: windows-latest , ruby: mingw }
         - { os: windows-latest , ruby: mswin }
         exclude:
+        - { os: macos-arm-oss  , ruby: "2.5" }
         - { os: windows-latest , ruby: debug }
         - { os: windows-latest , ruby: truffleruby }
         - { os: windows-latest , ruby: truffleruby-head }
diff --git a/README.md b/README.md
index 927cce11..e9cbf7b1 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ TODO: Write usage instructions here
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies.
-Then, run `rake spec` to run the tests.
+Then, run `rake test` to run the tests.
 You can also run `bin/console` for an interactive prompt that
 will allow you to experiment.
 
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index 98d5094f..3e14364a 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -31,7 +31,7 @@
 #include "bits.h"
 #include "static_assert.h"
 
-#define BIGDECIMAL_VERSION "3.1.6"
+#define BIGDECIMAL_VERSION "3.1.7"
 
 /* #define ENABLE_NUMERIC_STRING */
 
diff --git a/test/bigdecimal/test_bigdecimal.rb b/test/bigdecimal/test_bigdecimal.rb
index d44bcdaf..cae33751 100644
--- a/test/bigdecimal/test_bigdecimal.rb
+++ b/test/bigdecimal/test_bigdecimal.rb
@@ -290,7 +290,7 @@ def test_BigDecimal_with_exception_keyword
   end
 
   def test_s_ver
-    assert_raise_with_message(NoMethodError, /undefined method `ver'/) { BigDecimal.ver }
+    assert_raise_with_message(NoMethodError, /undefined method [`']ver'/) { BigDecimal.ver }
   end
 
   def test_s_allocate
@@ -302,7 +302,7 @@ def test_s_allocate
   end
 
   def test_s_new
-    assert_raise_with_message(NoMethodError, /undefined method `new'/) { BigDecimal.new("1") }
+    assert_raise_with_message(NoMethodError, /undefined method [`']new'/) { BigDecimal.new("1") }
   end
 
   def test_s_interpret_loosely
@@ -2067,7 +2067,7 @@ def test_dup
 
   def test_new_subclass
     c = Class.new(BigDecimal)
-    assert_raise_with_message(NoMethodError, /undefined method `new'/) { c.new(1) }
+    assert_raise_with_message(NoMethodError, /undefined method [`']new'/) { c.new(1) }
   end
 
   def test_bug6406