diff --git a/.gitignore b/.gitignore
index 53c6290e..724e0523 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ wolfcrypt*.tar.gz
 
 # Android
 IDE/Android/.idea/deploymentTargetDropDown.xml
+IDE/Android/.idea/vcs.xml
 IDE/Android/app/.cxx/
 IDE/Android/app/src/main/cpp/wolfssl
 
diff --git a/IDE/Android/README.md b/IDE/Android/README.md
index 0f3231c3..9778c883 100644
--- a/IDE/Android/README.md
+++ b/IDE/Android/README.md
@@ -75,7 +75,34 @@ del wolfssl
 mklink /D wolfssl ..\..\..\..\..\..\..\src\java\com\wolfssl\
 ```
 
-## 3. Push Certificate and KeyStore Files to Android Device
+## 3. Convert JKS KeyStore Files to BKS for Android Use
+
+Android does not support JKS format KeyStores. Several JUnit tests
+require BKS format KeyStore files which must be converted from the existing
+JKS files.
+
+To convert, you will need to download a Bouncy Castle provider JAR from the
+[Bouncy Castle website](https://www.bouncycastle.org/download/bouncy-castle-java/).
+Then run the conversion script from the `examples/certs` directory:
+
+```
+cd examples/certs
+./convert-to-bks.sh <path/to/bcprov.jar>
+```
+
+For example, when using `bcprov-jdk18on-1.78.1.jar`:
+
+```
+cd examples/certs
+./convert-to-bks.sh ~/Downloads/bcprov-jdk18on-1.78.1.jar
+```
+
+This will create the following BKS files needed by the Android tests:
+
+- `ca-server-rsa-2048.bks`
+- `ca-server-ecc-256.bks`
+
+## 4. Push Certificate and KeyStore Files to Android Device
 
 Several JUnit tests require access to certificate and KeyStore files. These
 files are located in the `examples/certs` directory and must be pushed to
@@ -92,18 +119,20 @@ adb shell mkdir -p /data/local/tmp/examples/certs/crl
 adb push ./examples/certs/ /data/local/tmp/examples/
 ```
 
-This will push all certificate files, KeyStore files (.jks, .wks, .p12),
-and subdirectories (intermediate, rsapss, crl) needed by the JUnit tests.
+This will push all certificate files, KeyStore files (.jks, .wks, .bks,
+.p12), and subdirectories (intermediate, rsapss, crl) needed by the JUnit
+tests.
 
-If this step is skipped, tests in the following classes will be skipped due
-to missing certificate files:
+If step 3 (BKS conversion) or this step is skipped, tests in the following
+classes will be skipped due to missing files:
 
-- `WolfSSLKeyStoreTest`
+- `WolfCryptPKIXCertPathBuilderTest`
 - `WolfCryptPKIXCertPathValidatorTest`
 - `WolfCryptPKIXRevocationCheckerTest`
+- `WolfSSLKeyStoreTest`
 - `WolfSSLCertManagerOCSPTest`
 
-## 4. Import and Build the Example Project with Android Studio
+## 5. Import and Build the Example Project with Android Studio
 
 1) Open the Android Studio project by double clicking on the `Android` folder
 in wolfcrypt-jni/IDE/. Or, from inside Android Studio, open the `Android`
diff --git a/examples/certs/convert-to-bks.sh b/examples/certs/convert-to-bks.sh
new file mode 100755
index 00000000..291d888a
--- /dev/null
+++ b/examples/certs/convert-to-bks.sh
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+# Convert JKS KeyStore files to BKS format for Android use.
+# Android does not support JKS KeyStores, so BKS format is needed.
+#
+# Requires a Bouncy Castle provider JAR (bcprov). Download from:
+#   https://www.bouncycastle.org/download/bouncy-castle-java/
+#
+# Usage:
+#   cd examples/certs
+#   ./convert-to-bks.sh <path/to/bcprov.jar>
+#
+# Example:
+#   ./convert-to-bks.sh ~/Downloads/bcprov-jdk18on-1.78.1.jar
+
+if [ -z "$1" ]; then
+    echo "Expected path to Bouncy Castle provider JAR."
+    echo "Usage: ./convert-to-bks.sh <path/to/bcprov.jar>"
+    echo ""
+    echo "Example:"
+    echo "  ./convert-to-bks.sh ~/Downloads/bcprov-jdk18on-1.78.1.jar"
+    exit 1
+fi
+
+PROVIDER="$1"
+
+if [ ! -f "$PROVIDER" ]; then
+    echo "Error: Provider JAR not found: $PROVIDER"
+    exit 1
+fi
+
+convert () {
+    if [ ! -f "${1}.jks" ]; then
+        echo "Warning: ${1}.jks not found, skipping"
+        return
+    fi
+
+    rm -f "${1}.bks" 2>/dev/null
+    keytool -importkeystore \
+        -srckeystore "${1}.jks" \
+        -destkeystore "${1}.bks" \
+        -srcstoretype JKS \
+        -deststoretype BKS \
+        -srcstorepass "wolfsslpassword" \
+        -deststorepass "wolfsslpassword" \
+        -provider org.bouncycastle.jce.provider.BouncyCastleProvider \
+        -providerpath "$PROVIDER"
+
+    if [ $? -eq 0 ]; then
+        echo "Converted: ${1}.jks -> ${1}.bks"
+    else
+        echo "Error converting: ${1}.jks"
+        FAIL=1
+    fi
+}
+
+FAIL=0
+
+echo "Converting JKS KeyStore files to BKS format..."
+echo ""
+
+convert "ca-server-rsa-2048"
+convert "ca-server-ecc-256"
+
+echo ""
+if [ $FAIL -ne 0 ]; then
+    echo "One or more conversions failed."
+    exit 1
+fi
+echo "Done."
+