diff --git a/testing/tests/tnc/tnccs-20-retry/description.txt b/testing/tests/tnc/tnccs-20-client-retry/description.txt
similarity index 100%
rename from testing/tests/tnc/tnccs-20-retry/description.txt
rename to testing/tests/tnc/tnccs-20-client-retry/description.txt
diff --git a/testing/tests/tnc/tnccs-20-retry/evaltest.dat b/testing/tests/tnc/tnccs-20-client-retry/evaltest.dat
similarity index 100%
rename from testing/tests/tnc/tnccs-20-retry/evaltest.dat
rename to testing/tests/tnc/tnccs-20-client-retry/evaltest.dat
diff --git a/testing/tests/tnc/tnccs-20-retry/hosts/carol/etc/ipsec.conf b/testing/tests/tnc/tnccs-20-client-retry/hosts/carol/etc/ipsec.conf
similarity index 100%
rename from testing/tests/tnc/tnccs-20-retry/hosts/carol/etc/ipsec.conf
rename to testing/tests/tnc/tnccs-20-client-retry/hosts/carol/etc/ipsec.conf
diff --git a/testing/tests/tnc/tnccs-20-retry/hosts/carol/etc/ipsec.secrets b/testing/tests/tnc/tnccs-20-client-retry/hosts/carol/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/tnc/tnccs-20-retry/hosts/carol/etc/ipsec.secrets
rename to testing/tests/tnc/tnccs-20-client-retry/hosts/carol/etc/ipsec.secrets
diff --git a/testing/tests/tnc/tnccs-20-retry/hosts/carol/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-client-retry/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/tnc/tnccs-20-retry/hosts/carol/etc/strongswan.conf
rename to testing/tests/tnc/tnccs-20-client-retry/hosts/carol/etc/strongswan.conf
diff --git a/testing/tests/tnc/tnccs-20-retry/hosts/carol/etc/tnc_config b/testing/tests/tnc/tnccs-20-client-retry/hosts/carol/etc/tnc_config
similarity index 100%
rename from testing/tests/tnc/tnccs-20-retry/hosts/carol/etc/tnc_config
rename to testing/tests/tnc/tnccs-20-client-retry/hosts/carol/etc/tnc_config
diff --git a/testing/tests/tnc/tnccs-20-retry/hosts/dave/etc/ipsec.conf b/testing/tests/tnc/tnccs-20-client-retry/hosts/dave/etc/ipsec.conf
similarity index 100%
rename from testing/tests/tnc/tnccs-20-retry/hosts/dave/etc/ipsec.conf
rename to testing/tests/tnc/tnccs-20-client-retry/hosts/dave/etc/ipsec.conf
diff --git a/testing/tests/tnc/tnccs-20-retry/hosts/dave/etc/ipsec.secrets b/testing/tests/tnc/tnccs-20-client-retry/hosts/dave/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/tnc/tnccs-20-retry/hosts/dave/etc/ipsec.secrets
rename to testing/tests/tnc/tnccs-20-client-retry/hosts/dave/etc/ipsec.secrets
diff --git a/testing/tests/tnc/tnccs-20-retry/hosts/dave/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-client-retry/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/tnc/tnccs-20-retry/hosts/dave/etc/strongswan.conf
rename to testing/tests/tnc/tnccs-20-client-retry/hosts/dave/etc/strongswan.conf
diff --git a/testing/tests/tnc/tnccs-20-retry/hosts/dave/etc/tnc_config b/testing/tests/tnc/tnccs-20-client-retry/hosts/dave/etc/tnc_config
similarity index 100%
rename from testing/tests/tnc/tnccs-20-retry/hosts/dave/etc/tnc_config
rename to testing/tests/tnc/tnccs-20-client-retry/hosts/dave/etc/tnc_config
diff --git a/testing/tests/tnc/tnccs-20-retry/hosts/moon/etc/ipsec.conf b/testing/tests/tnc/tnccs-20-client-retry/hosts/moon/etc/ipsec.conf
similarity index 100%
rename from testing/tests/tnc/tnccs-20-retry/hosts/moon/etc/ipsec.conf
rename to testing/tests/tnc/tnccs-20-client-retry/hosts/moon/etc/ipsec.conf
diff --git a/testing/tests/tnc/tnccs-20-retry/hosts/moon/etc/ipsec.secrets b/testing/tests/tnc/tnccs-20-client-retry/hosts/moon/etc/ipsec.secrets
similarity index 100%
rename from testing/tests/tnc/tnccs-20-retry/hosts/moon/etc/ipsec.secrets
rename to testing/tests/tnc/tnccs-20-client-retry/hosts/moon/etc/ipsec.secrets
diff --git a/testing/tests/tnc/tnccs-20-retry/hosts/moon/etc/strongswan.conf b/testing/tests/tnc/tnccs-20-client-retry/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/tnc/tnccs-20-retry/hosts/moon/etc/strongswan.conf
rename to testing/tests/tnc/tnccs-20-client-retry/hosts/moon/etc/strongswan.conf
diff --git a/testing/tests/tnc/tnccs-20-retry/hosts/moon/etc/tnc_config b/testing/tests/tnc/tnccs-20-client-retry/hosts/moon/etc/tnc_config
similarity index 100%
rename from testing/tests/tnc/tnccs-20-retry/hosts/moon/etc/tnc_config
rename to testing/tests/tnc/tnccs-20-client-retry/hosts/moon/etc/tnc_config
diff --git a/testing/tests/tnc/tnccs-20-retry/posttest.dat b/testing/tests/tnc/tnccs-20-client-retry/posttest.dat
similarity index 100%
rename from testing/tests/tnc/tnccs-20-retry/posttest.dat
rename to testing/tests/tnc/tnccs-20-client-retry/posttest.dat
diff --git a/testing/tests/tnc/tnccs-20-retry/pretest.dat b/testing/tests/tnc/tnccs-20-client-retry/pretest.dat
similarity index 100%
rename from testing/tests/tnc/tnccs-20-retry/pretest.dat
rename to testing/tests/tnc/tnccs-20-client-retry/pretest.dat
diff --git a/testing/tests/tnc/tnccs-20-retry/test.conf b/testing/tests/tnc/tnccs-20-client-retry/test.conf
similarity index 100%
rename from testing/tests/tnc/tnccs-20-retry/test.conf
rename to testing/tests/tnc/tnccs-20-client-retry/test.conf