diff --git a/CMakeLists.txt b/CMakeLists.txt
index b656a065..75317787 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -768,7 +768,7 @@ endif()
 #
 set(CPACK_PACKAGE_NAME "GmSSL")
 set(CPACK_PACKAGE_VENDOR "GmSSL develop team")
-set(CPACK_PACKAGE_VERSION "3.2.0-dev.1020")
+set(CPACK_PACKAGE_VERSION "3.2.0-dev.1021")
 set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/README.md)
 set(CPACK_NSIS_MODIFY_PATH ON)
 include(CPack)
diff --git a/cmake/cert_commands.cmake b/cmake/cert_commands.cmake
index f8bda751..aa035ca8 100644
--- a/cmake/cert_commands.cmake
+++ b/cmake/cert_commands.cmake
@@ -147,9 +147,14 @@ file(APPEND tlcp_server_certs.pem "${CERT_CONTENT}")
 file(READ cacert.pem CERT_CONTENT)
 file(APPEND tlcp_server_certs.pem "${CERT_CONTENT}")
 
+file(WRITE tlcp_server_keys.pem "")
+file(READ signkey.pem KEY_CONTENT)
+file(APPEND tlcp_server_keys.pem "${KEY_CONTENT}")
+file(READ enckey.pem KEY_CONTENT)
+file(APPEND tlcp_server_keys.pem "${KEY_CONTENT}")
+
 file(WRITE tls_server_certs.pem "")
 file(READ signcert.pem CERT_CONTENT)
 file(APPEND tls_server_certs.pem "${CERT_CONTENT}")
 file(READ cacert.pem CERT_CONTENT)
 file(APPEND tls_server_certs.pem "${CERT_CONTENT}")
-
diff --git a/cmake/tlcp_commands.cmake b/cmake/tlcp_commands.cmake
index 80a58a14..6b427ec2 100644
--- a/cmake/tlcp_commands.cmake
+++ b/cmake/tlcp_commands.cmake
@@ -7,11 +7,7 @@ if(NOT EXISTS tlcp_server_certs.pem)
 	message(FATAL_ERROR "file does not exist")
 endif()
 
-if(NOT EXISTS signkey.pem)
-	message(FATAL_ERROR "file does not exist")
-endif()
-
-if(NOT EXISTS enckey.pem)
+if(NOT EXISTS tlcp_server_keys.pem)
 	message(FATAL_ERROR "file does not exist")
 endif()
 
@@ -28,13 +24,13 @@ endif()
 
 if(WIN32)
 	execute_process(
-		COMMAND cmd /c "start /B bin\\gmssl tlcp_server -port ${TLCP_TEST_PORT} -cert tlcp_server_certs.pem -key signkey.pem -pass P@ssw0rd -ex_key enckey.pem -ex_pass P@ssw0rd > tlcp_server.log 2>&1"
+		COMMAND cmd /c "start /B bin\\gmssl tlcp_server -port ${TLCP_TEST_PORT} -cert tlcp_server_certs.pem -key tlcp_server_keys.pem -pass P@ssw0rd > tlcp_server.log 2>&1"
 		RESULT_VARIABLE SERVER_RESULT
 		TIMEOUT 5
 	)
 else()
 	execute_process(
-		COMMAND bash -c "nohup bin/gmssl tlcp_server -port ${TLCP_TEST_PORT} -cert tlcp_server_certs.pem -key signkey.pem -pass P@ssw0rd -ex_key enckey.pem -ex_pass P@ssw0rd > tlcp_server.log 2>&1 &"
+		COMMAND bash -c "nohup bin/gmssl tlcp_server -port ${TLCP_TEST_PORT} -cert tlcp_server_certs.pem -key tlcp_server_keys.pem -pass P@ssw0rd > tlcp_server.log 2>&1 &"
 		RESULT_VARIABLE SERVER_RESULT
 		TIMEOUT 5
 	)
@@ -47,13 +43,13 @@ set(FOUND_INDEX -1)
 foreach(i RANGE 1 15)
 	if (WIN32)
 		execute_process(
-			COMMAND cmd /c "start /B bin\\gmssl tlcp_client -host 127.0.0.1 -port ${TLCP_TEST_PORT} -cacert rootcacert.pem > tlcp_client.log 2>&1"
+			COMMAND cmd /c "start /B bin\\gmssl tlcp_client -host 127.0.0.1 -port ${TLCP_TEST_PORT} -cacert rootcacert.pem -cipher_suite TLS_ECC_SM4_CBC_SM3 > tlcp_client.log 2>&1"
 			RESULT_VARIABLE CLIENT_RESULT
 			TIMEOUT 5
 		)
 	else()
 		execute_process(
-			COMMAND bash -c "bin/gmssl tlcp_client -host 127.0.0.1 -port ${TLCP_TEST_PORT} -cacert rootcacert.pem < /dev/null > tlcp_client.log 2>&1 &"
+			COMMAND bash -c "bin/gmssl tlcp_client -host 127.0.0.1 -port ${TLCP_TEST_PORT} -cacert rootcacert.pem -cipher_suite TLS_ECC_SM4_CBC_SM3 < /dev/null > tlcp_client.log 2>&1 &"
 			RESULT_VARIABLE CLIENT_RESULT
 			TIMEOUT 5
 		)
diff --git a/include/gmssl/version.h b/include/gmssl/version.h
index c4723afa..d870633a 100644
--- a/include/gmssl/version.h
+++ b/include/gmssl/version.h
@@ -19,7 +19,7 @@ extern "C" {
 
 // Also update CPACK_PACKAGE_VERSION in CMakeLists.txt
 #define GMSSL_VERSION_NUM	30200
-#define GMSSL_VERSION_STR	"GmSSL 3.2.0-dev.1020"
+#define GMSSL_VERSION_STR	"GmSSL 3.2.0-dev.1021"
 
 int gmssl_version_num(void);
 const char *gmssl_version_str(void);