diff --git a/core/src/test/java/com/google/bitcoin/protocols/payments/X509UtilsTest.java b/core/src/test/java/com/google/bitcoin/crypto/X509UtilsTest.java
similarity index 96%
rename from core/src/test/java/com/google/bitcoin/protocols/payments/X509UtilsTest.java
rename to core/src/test/java/com/google/bitcoin/crypto/X509UtilsTest.java
index fc740300..4eed8d4e 100644
--- a/core/src/test/java/com/google/bitcoin/protocols/payments/X509UtilsTest.java
+++ b/core/src/test/java/com/google/bitcoin/crypto/X509UtilsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.bitcoin.protocols.payments;
+package com.google.bitcoin.crypto;
 
 import com.google.bitcoin.crypto.X509Utils;
 import org.junit.Test;
diff --git a/core/src/test/resources/com/google/bitcoin/protocols/payments/comodo-smime.crt b/core/src/test/resources/com/google/bitcoin/crypto/comodo-smime.crt
similarity index 100%
rename from core/src/test/resources/com/google/bitcoin/protocols/payments/comodo-smime.crt
rename to core/src/test/resources/com/google/bitcoin/crypto/comodo-smime.crt
diff --git a/core/src/test/resources/com/google/bitcoin/protocols/payments/startssl-client.crt b/core/src/test/resources/com/google/bitcoin/crypto/startssl-client.crt
similarity index 100%
rename from core/src/test/resources/com/google/bitcoin/protocols/payments/startssl-client.crt
rename to core/src/test/resources/com/google/bitcoin/crypto/startssl-client.crt
diff --git a/core/src/test/resources/com/google/bitcoin/protocols/payments/startssl-smime.crt b/core/src/test/resources/com/google/bitcoin/crypto/startssl-smime.crt
similarity index 100%
rename from core/src/test/resources/com/google/bitcoin/protocols/payments/startssl-smime.crt
rename to core/src/test/resources/com/google/bitcoin/crypto/startssl-smime.crt