1 files changed, 19 insertions, 0 deletions
diff --git a/luni/src/test/java/tests/targets/security/cert/CertificateTest.java b/luni/src/test/java/tests/targets/security/cert/CertificateTest.java
index adfe275f2db..80b34c017de 100644
--- a/luni/src/test/java/tests/targets/security/cert/CertificateTest.java
+++ b/luni/src/test/java/tests/targets/security/cert/CertificateTest.java
@@ -35,8 +35,27 @@ import java.util.List;
 import junit.framework.TestCase;
 import libcore.java.security.StandardNames;
 
+import dalvik.system.VMRuntime;
+import sun.security.jca.Providers;
+
 public class CertificateTest extends TestCase {
 
+    // Allow access to deprecated BC algorithms in this test, so we can ensure they
+    // continue to work
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        Providers.setMaximumAllowableApiLevelForBcDeprecation(
+                VMRuntime.getRuntime().getTargetSdkVersion());
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        Providers.setMaximumAllowableApiLevelForBcDeprecation(
+                Providers.DEFAULT_MAXIMUM_ALLOWABLE_TARGET_API_LEVEL_FOR_BC_DEPRECATION);
+        super.tearDown();
+    }
+
     /*
      * Following certificate chain was taken from https://www.verisign.com and
      * uses MD2withRSA for the root certificate. This chain stops validating