diff --git a/WORKSPACE b/WORKSPACE
index 42aa6de..b02f4ef 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -86,6 +86,16 @@ maven_jar(
     artifact = "org.bouncycastle:bcprov-jdk15on:1.56",
 )
 
+maven_jar(
+    name = "bouncycastle_1_57",
+    artifact = "org.bouncycastle:bcprov-jdk15on:1.57",
+)
+
+maven_jar(
+    name = "bouncycastle_1_58",
+    artifact = "org.bouncycastle:bcprov-jdk15on:1.58",
+)
+
 maven_jar(
     name = "spongycastle_core_1_50",
     artifact = "com.madgag.spongycastle:core:1.50.0.0",
diff --git a/build_defs.bzl b/build_defs.bzl
index 61858bd..3baa4c5 100644
--- a/build_defs.bzl
+++ b/build_defs.bzl
@@ -1,10 +1,10 @@
-bouncycastle_versions = range(49, 57)
+bouncycastle_versions = range(49, 59)
 
 # These targets run all tests.
 def bouncycastle_all_tests(srcs, deps, size, test_class):
   """BouncyCastle version-specific tests."""
 
-  # Generates BouncyCastleAllTests_1_56, ..., BouncyCastleAllTests_1_49
+  # Generates BouncyCastleAllTests_1_58, ..., BouncyCastleAllTests_1_49
   for version in bouncycastle_versions:
     native.java_test(
         name = "BouncyCastleAllTests_1_%s" % version,
@@ -31,7 +31,7 @@ def bouncycastle_all_tests(srcs, deps, size, test_class):
 def bouncycastle_tests(srcs, deps, size, test_class):
   """BouncyCastle version-specific tests."""
 
-  # Generates BouncyCastleTest_1_56, ..., BouncyCastleTest_1_49
+  # Generates BouncyCastleTest_1_58, ..., BouncyCastleTest_1_49
   for version in bouncycastle_versions:
     native.java_test(
         name = "BouncyCastleTest_1_%s" % version,