diff --git a/tests/data_files/Makefile b/tests/data_files/Makefile
index 01d2379..db568ad 100644
--- a/tests/data_files/Makefile
+++ b/tests/data_files/Makefile
@@ -17,6 +17,7 @@
 TOP_DIR = ../..
 MBEDTLS_CERT_WRITE ?= $(TOP_DIR)/programs/x509/cert_write
 MBEDTLS_CERT_REQ ?= $(TOP_DIR)/programs/x509/cert_req
+MBEDTLS_GEN_KEY ?= $(TOP_DIR)/programs/pkey/gen_key
 
 
 ## Build the generated test data. Note that since the final outputs
@@ -718,6 +719,21 @@
 	$(OPENSSL) genrsa -out $@ 4096
 all_final += rsa_pkcs1_4096_clear.pem
 
+### RSA keys in DER format used in test_suite_pk.
+rsa_1024.der: $(MBEDTLS_GEN_KEY)
+	$(MBEDTLS_GEN_KEY) type=rsa rsa_keysize=1024 format=der filename="$@"
+rsa_1026.der: $(MBEDTLS_GEN_KEY)
+	$(MBEDTLS_GEN_KEY) type=rsa rsa_keysize=1026 format=der filename="$@"
+rsa_1028.der: $(MBEDTLS_GEN_KEY)
+	$(MBEDTLS_GEN_KEY) type=rsa rsa_keysize=1028 format=der filename="$@"
+rsa_1030.der: $(MBEDTLS_GEN_KEY)
+	$(MBEDTLS_GEN_KEY) type=rsa rsa_keysize=1030 format=der filename="$@"
+rsa_2048.der: $(MBEDTLS_GEN_KEY)
+	$(MBEDTLS_GEN_KEY) type=rsa rsa_keysize=2048 format=der filename="$@"
+rsa_4096.der: $(MBEDTLS_GEN_KEY)
+	$(MBEDTLS_GEN_KEY) type=rsa rsa_keysize=4096 format=der filename="$@"
+all_final += rsa_1024.der rsa_1026.der rsa_1028.der rsa_1030.der rsa_2048.der rsa_4096.der
+
 ###
 ### PKCS1-encoded, encrypted RSA keys
 ###
@@ -1189,6 +1205,41 @@
 #### Generate various EC keys
 ################################################################
 
+### EC keys in DER format to be used in test_suite_pk.
+seedfile:
+	ln -s $(TOP_DIR)/seedfile ./seedfile
+
+ec_brainpoolP256r1.der: seedfile
+	$(MBEDTLS_GEN_KEY) type=ec ec_curve=brainpoolP256r1 format=der filename="$@"
+ec_brainpoolP384r1.der: seedfile
+	$(MBEDTLS_GEN_KEY) type=ec ec_curve=brainpoolP384r1 format=der filename="$@"
+ec_brainpoolP512r1.der: seedfile
+	$(MBEDTLS_GEN_KEY) type=ec ec_curve=brainpoolP512r1 format=der filename="$@"
+ec_secp192k1.der: seedfile
+	$(MBEDTLS_GEN_KEY) type=ec ec_curve=secp192k1 format=der filename="$@"
+ec_secp192r1.der: seedfile
+	$(MBEDTLS_GEN_KEY) type=ec ec_curve=secp192r1 format=der filename="$@"
+ec_secp224k1.der: seedfile
+	$(MBEDTLS_GEN_KEY) type=ec ec_curve=secp224k1 format=der filename="$@"
+ec_secp224r1.der: seedfile
+	$(MBEDTLS_GEN_KEY) type=ec ec_curve=secp224r1 format=der filename="$@"
+ec_secp256k1.der: seedfile
+	$(MBEDTLS_GEN_KEY) type=ec ec_curve=secp256k1 format=der filename="$@"
+ec_secp256r1.der: seedfile
+	$(MBEDTLS_GEN_KEY) type=ec ec_curve=secp256r1 format=der filename="$@"
+ec_secp384r1.der: seedfile
+	$(MBEDTLS_GEN_KEY) type=ec ec_curve=secp384r1 format=der filename="$@"
+ec_secp521r1.der: seedfile
+	$(MBEDTLS_GEN_KEY) type=ec ec_curve=secp521r1 format=der filename="$@"
+ec_x25519.der: seedfile
+	$(MBEDTLS_GEN_KEY) type=ec ec_curve=x25519 format=der filename="$@"
+ec_x448.der: seedfile
+	$(MBEDTLS_GEN_KEY) type=ec ec_curve=x448 format=der filename="$@"
+all_final += ec_brainpoolP256r1.der ec_brainpoolP384r1.der ec_brainpoolP512r1.der \
+		ec_secp192k1.der ec_secp192r1.der ec_secp224k1.der ec_secp224r1.der \
+		ec_secp256k1.der ec_secp256r1.der ec_secp384r1.der ec_secp521r1.der \
+		ec_x25519.der ec_x448.der
+
 ###
 ### PKCS8 encoded
 ###
diff --git a/tests/data_files/ec_brainpoolP256r1.der b/tests/data_files/ec_brainpoolP256r1.der
new file mode 100644
index 0000000..5c9ce38
--- /dev/null
+++ b/tests/data_files/ec_brainpoolP256r1.der
Binary files differ
diff --git a/tests/data_files/ec_brainpoolP384r1.der b/tests/data_files/ec_brainpoolP384r1.der
new file mode 100644
index 0000000..11e393d
--- /dev/null
+++ b/tests/data_files/ec_brainpoolP384r1.der
Binary files differ
diff --git a/tests/data_files/ec_brainpoolP512r1.der b/tests/data_files/ec_brainpoolP512r1.der
new file mode 100644
index 0000000..84fce0a
--- /dev/null
+++ b/tests/data_files/ec_brainpoolP512r1.der
Binary files differ
diff --git a/tests/data_files/ec_secp192k1.der b/tests/data_files/ec_secp192k1.der
new file mode 100644
index 0000000..2d7c728
--- /dev/null
+++ b/tests/data_files/ec_secp192k1.der
Binary files differ
diff --git a/tests/data_files/ec_secp192r1.der b/tests/data_files/ec_secp192r1.der
new file mode 100644
index 0000000..1732581
--- /dev/null
+++ b/tests/data_files/ec_secp192r1.der
Binary files differ
diff --git a/tests/data_files/ec_secp224k1.der b/tests/data_files/ec_secp224k1.der
new file mode 100644
index 0000000..108b52b
--- /dev/null
+++ b/tests/data_files/ec_secp224k1.der
Binary files differ
diff --git a/tests/data_files/ec_secp224r1.der b/tests/data_files/ec_secp224r1.der
new file mode 100644
index 0000000..1ee94d7
--- /dev/null
+++ b/tests/data_files/ec_secp224r1.der
Binary files differ
diff --git a/tests/data_files/ec_secp256k1.der b/tests/data_files/ec_secp256k1.der
new file mode 100644
index 0000000..4b11a2e
--- /dev/null
+++ b/tests/data_files/ec_secp256k1.der
Binary files differ
diff --git a/tests/data_files/ec_secp256r1.der b/tests/data_files/ec_secp256r1.der
new file mode 100644
index 0000000..d2cf874
--- /dev/null
+++ b/tests/data_files/ec_secp256r1.der
Binary files differ
diff --git a/tests/data_files/ec_secp384r1.der b/tests/data_files/ec_secp384r1.der
new file mode 100644
index 0000000..29860a4
--- /dev/null
+++ b/tests/data_files/ec_secp384r1.der
Binary files differ
diff --git a/tests/data_files/ec_secp521r1.der b/tests/data_files/ec_secp521r1.der
new file mode 100644
index 0000000..4f19fe4
--- /dev/null
+++ b/tests/data_files/ec_secp521r1.der
Binary files differ
diff --git a/tests/data_files/ec_x25519.der b/tests/data_files/ec_x25519.der
new file mode 100644
index 0000000..5c1c32d
--- /dev/null
+++ b/tests/data_files/ec_x25519.der
Binary files differ
diff --git a/tests/data_files/ec_x448.der b/tests/data_files/ec_x448.der
new file mode 100644
index 0000000..849d4b8
--- /dev/null
+++ b/tests/data_files/ec_x448.der
Binary files differ
diff --git a/tests/data_files/rsa_1024.der b/tests/data_files/rsa_1024.der
new file mode 100644
index 0000000..4f68112
--- /dev/null
+++ b/tests/data_files/rsa_1024.der
Binary files differ
diff --git a/tests/data_files/rsa_1026.der b/tests/data_files/rsa_1026.der
new file mode 100644
index 0000000..2c3d938
--- /dev/null
+++ b/tests/data_files/rsa_1026.der
Binary files differ
diff --git a/tests/data_files/rsa_1028.der b/tests/data_files/rsa_1028.der
new file mode 100644
index 0000000..97c658c
--- /dev/null
+++ b/tests/data_files/rsa_1028.der
Binary files differ
diff --git a/tests/data_files/rsa_1030.der b/tests/data_files/rsa_1030.der
new file mode 100644
index 0000000..754109d
--- /dev/null
+++ b/tests/data_files/rsa_1030.der
Binary files differ
diff --git a/tests/data_files/rsa_2048.der b/tests/data_files/rsa_2048.der
new file mode 100644
index 0000000..4003161
--- /dev/null
+++ b/tests/data_files/rsa_2048.der
Binary files differ
diff --git a/tests/data_files/rsa_4096.der b/tests/data_files/rsa_4096.der
new file mode 100644
index 0000000..875e47b
--- /dev/null
+++ b/tests/data_files/rsa_4096.der
Binary files differ