diff --git a/tests/data_files/Makefile b/tests/data_files/Makefile
index e128900..fd42dc8 100644
--- a/tests/data_files/Makefile
+++ b/tests/data_files/Makefile
@@ -222,6 +222,7 @@
 
 test_ca_int_rsa1 = test-int-ca.crt
 test_ca_int_ec = test-int-ca2.crt
+test_ca_int_key_file_ec = test-int-ca2.key
 
 # server7*
 
@@ -275,6 +276,18 @@
 
 server7_all: server7.crt server7-badsign.crt server7-expired.crt server7-future.crt server7_int-ca-exp.crt server7_int-ca.crt server7_int-ca_ca2.crt server7_all_space.crt server7_pem_space.crt server7_trailing_space.crt server7_spurious_int-ca.crt
 
+# server8*
+
+server8.crt: server8.key
+	$(MBEDTLS_CERT_WRITE) subject_key=$< subject_name="C=NL, O=PolarSSL, CN=localhost" serial=17 issuer_crt=$(test_ca_int_ec) issuer_key=$(test_ca_int_key_file_ec) not_before=20190210144406 not_after=20290210144406 md=SHA256 version=3 output_file=$@
+all_final += server8.crt
+
+server8_int-ca2.crt: server8.crt $(test_ca_int_ec)
+	cat $^ > $@
+all_final += server8_int-ca2.crt
+
+server8_all: server8.crt server8_int-ca2.crt
+
 cli2.req.sha256: cli2.key
 	$(MBEDTLS_CERT_REQ) output_file=$@ filename=$< subject_name="C=NL,O=PolarSSL,CN=PolarSSL Test Client 2" md=SHA256
 
@@ -1332,6 +1345,7 @@
 .PHONY: keys_rsa_enc_pkcs8_v1_4096 keys_rsa_enc_pkcs8_v2_4096
 .PHONY: server1_all
 .PHONY: server7_all
+.PHONY: server8_all
 
 # These files should not be committed to the repository.
 list_intermediate: