diff --git a/test/.excludes-zjit/OpenSSL/OSSL.rb b/test/.excludes-zjit/OpenSSL/OSSL.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/OSSL.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestASN1.rb b/test/.excludes-zjit/OpenSSL/TestASN1.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestASN1.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestBN.rb b/test/.excludes-zjit/OpenSSL/TestBN.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestBN.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestBuffering.rb b/test/.excludes-zjit/OpenSSL/TestBuffering.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestBuffering.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestCase.rb b/test/.excludes-zjit/OpenSSL/TestCase.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestCase.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestCipher.rb b/test/.excludes-zjit/OpenSSL/TestCipher.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestCipher.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestConfig.rb b/test/.excludes-zjit/OpenSSL/TestConfig.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestConfig.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestDigest.rb b/test/.excludes-zjit/OpenSSL/TestDigest.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestDigest.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestEC.rb b/test/.excludes-zjit/OpenSSL/TestEC.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestEC.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestEOF1.rb b/test/.excludes-zjit/OpenSSL/TestEOF1.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestEOF1.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestEOF1LowlevelSocket.rb b/test/.excludes-zjit/OpenSSL/TestEOF1LowlevelSocket.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestEOF1LowlevelSocket.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestEOF2.rb b/test/.excludes-zjit/OpenSSL/TestEOF2.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestEOF2.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestEOF2LowlevelSocket.rb b/test/.excludes-zjit/OpenSSL/TestEOF2LowlevelSocket.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestEOF2LowlevelSocket.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestEngine.rb b/test/.excludes-zjit/OpenSSL/TestEngine.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestEngine.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestFIPS.rb b/test/.excludes-zjit/OpenSSL/TestFIPS.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestFIPS.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestHMAC.rb b/test/.excludes-zjit/OpenSSL/TestHMAC.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestHMAC.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestKDF.rb b/test/.excludes-zjit/OpenSSL/TestKDF.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestKDF.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestNSSPI.rb b/test/.excludes-zjit/OpenSSL/TestNSSPI.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestNSSPI.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestOCSP.rb b/test/.excludes-zjit/OpenSSL/TestOCSP.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestOCSP.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestPKCS12.rb b/test/.excludes-zjit/OpenSSL/TestPKCS12.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestPKCS12.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestPKCS7.rb b/test/.excludes-zjit/OpenSSL/TestPKCS7.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestPKCS7.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestPKey.rb b/test/.excludes-zjit/OpenSSL/TestPKey.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestPKey.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestPKeyDH.rb b/test/.excludes-zjit/OpenSSL/TestPKeyDH.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestPKeyDH.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestPKeyDSA.rb b/test/.excludes-zjit/OpenSSL/TestPKeyDSA.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestPKeyDSA.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestPKeyRSA.rb b/test/.excludes-zjit/OpenSSL/TestPKeyRSA.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestPKeyRSA.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestPair.rb b/test/.excludes-zjit/OpenSSL/TestPair.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestPair.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestPairLowlevelSocket.rb b/test/.excludes-zjit/OpenSSL/TestPairLowlevelSocket.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestPairLowlevelSocket.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestProvider.rb b/test/.excludes-zjit/OpenSSL/TestProvider.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestProvider.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestRandom.rb b/test/.excludes-zjit/OpenSSL/TestRandom.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestRandom.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestSSL.rb b/test/.excludes-zjit/OpenSSL/TestSSL.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestSSL.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestSSLSession.rb b/test/.excludes-zjit/OpenSSL/TestSSLSession.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestSSLSession.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestTimestamp.rb b/test/.excludes-zjit/OpenSSL/TestTimestamp.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestTimestamp.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestX509Attribute.rb b/test/.excludes-zjit/OpenSSL/TestX509Attribute.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestX509Attribute.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestX509CRL.rb b/test/.excludes-zjit/OpenSSL/TestX509CRL.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestX509CRL.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestX509Certificate.rb b/test/.excludes-zjit/OpenSSL/TestX509Certificate.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestX509Certificate.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestX509Extension.rb b/test/.excludes-zjit/OpenSSL/TestX509Extension.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestX509Extension.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestX509Name.rb b/test/.excludes-zjit/OpenSSL/TestX509Name.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestX509Name.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestX509Request.rb b/test/.excludes-zjit/OpenSSL/TestX509Request.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestX509Request.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/OpenSSL/TestX509Store.rb b/test/.excludes-zjit/OpenSSL/TestX509Store.rb
deleted file mode 100644
index 87f30945a2..0000000000
--- a/test/.excludes-zjit/OpenSSL/TestX509Store.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests fail with ZJIT')
diff --git a/test/.excludes-zjit/Prism/DumpTest.rb b/test/.excludes-zjit/Prism/DumpTest.rb
deleted file mode 100644
index 232903bfea..0000000000
--- a/test/.excludes-zjit/Prism/DumpTest.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests crash with ZJIT')
diff --git a/test/.excludes-zjit/Prism/SnippetsTest.rb b/test/.excludes-zjit/Prism/SnippetsTest.rb
deleted file mode 100644
index 232903bfea..0000000000
--- a/test/.excludes-zjit/Prism/SnippetsTest.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(/test_/, 'Tests crash with ZJIT')
diff --git a/test/.excludes-zjit/TestFixnum.rb b/test/.excludes-zjit/TestFixnum.rb
index b2ca8c67f7..6aa0a1f95b 100644
--- a/test/.excludes-zjit/TestFixnum.rb
+++ b/test/.excludes-zjit/TestFixnum.rb
@@ -1 +1,2 @@
+# Issue: https://github.com/Shopify/ruby/issues/646
 exclude(/test_/, 'Tests make ZJIT panic')
diff --git a/test/.excludes-zjit/TestRefinement.rb b/test/.excludes-zjit/TestRefinement.rb
deleted file mode 100644
index 39e504c9a2..0000000000
--- a/test/.excludes-zjit/TestRefinement.rb
+++ /dev/null
@@ -1 +0,0 @@
-exclude(:test_override_builtin_method_with_method_added, 'Test fails with ZJIT')