diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 17ab3da..6fd9c04 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,13 +36,13 @@ images_build:
   stage: prebuild
   extends: .build_docker_images
   variables:
-    UNITTEST_IMAGE_TAG: unittest-tsg-diagnose:latest
+    CLIENT_IMAGE_TAG: unittest-tsg-diagnose:latest
     SERVER_WEB_IMAGE_TAG: badssl-tsg-diagnose:latest
     DNS_IMAGES_TAGE: dns-server-diagnose:latest
   script:
     - mkdir -p images
-    - docker build -t $UNITTEST_IMAGE_TAG -f ./images_build/unittest_python/Dockerfile ./images_build/unittest_python/
-    - docker save $UNITTEST_IMAGE_TAG > images/unittest.tar
+    - docker build -t $CLIENT_IMAGE_TAG -f ./images_build/client/Dockerfile ./images_build/client/
+    - docker save $CLIENT_IMAGE_TAG > images/client.tar
     - docker build -t $SERVER_WEB_IMAGE_TAG -f ./images_build/server_web/Dockerfile ./images_build/server_web/
     - docker save $SERVER_WEB_IMAGE_TAG  > images/server_web.tar
     - docker build -t $DNS_IMAGES_TAGE -f ./images_build/dnsmasq/Dockerfile ./images_build/dnsmasq
diff --git a/cmake/Package.cmake b/cmake/Package.cmake
index db98a49..592c3eb 100644
--- a/cmake/Package.cmake
+++ b/cmake/Package.cmake
@@ -22,7 +22,7 @@ set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreunInstall.i
 set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostunInstall.in)
 
 install(FILES compose/docker-compose.yml DESTINATION ./compose)
-install(FILES images_build/unittest_python/unittest/etc/tsg-diagnose.config DESTINATION ./etc)
+install(FILES images_build/client/unittest/etc/tsg-diagnose.config DESTINATION ./etc)
 install(FILES service/tsg-diagnose.service DESTINATION /usr/lib/systemd/system)
 install(FILES images_build/dnsmasq/config/dnsmasq.conf DESTINATION /opt/tsg/tsg-diagnose/etc/)
 install(DIRECTORY images/ DESTINATION ./images)
diff --git a/cmake/PostInstall.in b/cmake/PostInstall.in
index b2fd94c..3fb1b80 100644
--- a/cmake/PostInstall.in
+++ b/cmake/PostInstall.in
@@ -5,5 +5,5 @@ if [ $1 == 2 ]; then
     docker rmi -f dns-server-diagnose
 fi
 docker load < /opt/tsg/tsg-diagnose/images/server_web.tar
-docker load < /opt/tsg/tsg-diagnose/images/unittest.tar
+docker load < /opt/tsg/tsg-diagnose/images/client.tar
 docker load < /opt/tsg/tsg-diagnose/images/dns.tar
diff --git a/images_build/unittest_python/Dockerfile b/images_build/client/Dockerfile
similarity index 100%
rename from images_build/unittest_python/Dockerfile
rename to images_build/client/Dockerfile
diff --git a/images_build/unittest_python/README.md b/images_build/client/README.md
similarity index 100%
rename from images_build/unittest_python/README.md
rename to images_build/client/README.md
diff --git a/images_build/unittest_python/unittest/badssl.test.hosts b/images_build/client/unittest/badssl.test.hosts
similarity index 100%
rename from images_build/unittest_python/unittest/badssl.test.hosts
rename to images_build/client/unittest/badssl.test.hosts
diff --git a/images_build/unittest_python/unittest/clear_file_timeout.py b/images_build/client/unittest/clear_file_timeout.py
similarity index 100%
rename from images_build/unittest_python/unittest/clear_file_timeout.py
rename to images_build/client/unittest/clear_file_timeout.py
diff --git a/images_build/unittest_python/unittest/etc/tsg-diagnose.config b/images_build/client/unittest/etc/tsg-diagnose.config
similarity index 100%
rename from images_build/unittest_python/unittest/etc/tsg-diagnose.config
rename to images_build/client/unittest/etc/tsg-diagnose.config
diff --git a/images_build/unittest_python/unittest/tsg_diagnose.py b/images_build/client/unittest/tsg_diagnose.py
similarity index 100%
rename from images_build/unittest_python/unittest/tsg_diagnose.py
rename to images_build/client/unittest/tsg_diagnose.py
diff --git a/images_build/unittest_python/unittest/wait-for b/images_build/client/unittest/wait-for
similarity index 100%
rename from images_build/unittest_python/unittest/wait-for
rename to images_build/client/unittest/wait-for