diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/ArmoredInputStreamTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/ArmoredInputStreamTest.java
index 74d3f8207..57452d64b 100644
--- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/ArmoredInputStreamTest.java
+++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/ArmoredInputStreamTest.java
@@ -19,9 +19,9 @@ public class ArmoredInputStreamTest {
     @Test
     public void armoredInputStream__withDifferentLineEndings() throws Exception {
         // these are generated by GPG4USB, see https://github.com/gpg4usb/gpg4usb/issues/25
-        ArmoredInputStream stream1 = new ArmoredInputStream(UncachedKeyringTest.class.getResourceAsStream("/armored_crcrlf.asc"));
-        ArmoredInputStream stream2 = new ArmoredInputStream(UncachedKeyringTest.class.getResourceAsStream("/armored_crlf.asc"));
-        ArmoredInputStream stream3 = new ArmoredInputStream(UncachedKeyringTest.class.getResourceAsStream("/armored_lf.asc"));
+        ArmoredInputStream stream1 = new ArmoredInputStream(ArmoredInputStreamTest.class.getResourceAsStream("/armored_crcrlf.asc"));
+        ArmoredInputStream stream2 = new ArmoredInputStream(ArmoredInputStreamTest.class.getResourceAsStream("/armored_crlf.asc"));
+        ArmoredInputStream stream3 = new ArmoredInputStream(ArmoredInputStreamTest.class.getResourceAsStream("/armored_lf.asc"));
 
         assertEquals(1, stream1.getArmorHeaders().length);
         assertEquals("Comment: comment content", stream1.getArmorHeaders()[0]);
diff --git a/extern/bouncycastle b/extern/bouncycastle
index 61f5f64fa..0e2e96778 160000
--- a/extern/bouncycastle
+++ b/extern/bouncycastle
@@ -1 +1 @@
-Subproject commit 61f5f64faa8cff3fde1956f70b8dfabf75d1fbec
+Subproject commit 0e2e96778b2aaf55dc582748de9b7827ab01086f