diff --git a/test/case/ietf_system/Readme.adoc b/test/case/ietf_system/Readme.adoc
index c8d5173d..61f368d3 100644
--- a/test/case/ietf_system/Readme.adoc
+++ b/test/case/ietf_system/Readme.adoc
@@ -13,8 +13,6 @@ include::timezone/Readme.adoc[]
 
 include::timezone_utc_offset/Readme.adoc[]
 
-include::ssh_key_authentication/Readme.adoc[]
-
 include::upgrade/Readme.adoc[]
 
 include::ntp_client/Readme.adoc[]
diff --git a/test/case/ietf_system/ietf_system.yaml b/test/case/ietf_system/ietf_system.yaml
index c28ec21b..3c866bab 100644
--- a/test/case/ietf_system/ietf_system.yaml
+++ b/test/case/ietf_system/ietf_system.yaml
@@ -14,9 +14,6 @@
 - name: timezone_utc_offset
   case: timezone_utc_offset/test.py
 
-- name: ssh_key_authentication
-  case: ssh_key_authentication/test.py
-
 - name: ntp_client
   case: ntp_client/test.py
 
diff --git a/test/case/infix_services/Readme.adoc b/test/case/infix_services/Readme.adoc
index 705b460f..3458ae61 100644
--- a/test/case/infix_services/Readme.adoc
+++ b/test/case/infix_services/Readme.adoc
@@ -8,3 +8,5 @@ include::mdns_allow_deny/Readme.adoc[]
 include::services_basic/Readme.adoc[]
 
 include::ssh_server_config/Readme.adoc[]
+
+include::ssh_key_authentication/Readme.adoc[]
diff --git a/test/case/infix_services/infix_services.yaml b/test/case/infix_services/infix_services.yaml
index 0c163587..29840c55 100644
--- a/test/case/infix_services/infix_services.yaml
+++ b/test/case/infix_services/infix_services.yaml
@@ -12,3 +12,6 @@
 
 - name: ssh_server_config
   case: ssh_server_config/test.py
+
+- name: ssh_key_authentication
+  case: ssh_key_authentication/test.py
diff --git a/test/case/ietf_system/ssh_key_authentication/Readme.adoc b/test/case/infix_services/ssh_key_authentication/Readme.adoc
similarity index 84%
rename from test/case/ietf_system/ssh_key_authentication/Readme.adoc
rename to test/case/infix_services/ssh_key_authentication/Readme.adoc
index 2e9f7f8e..3772331e 100644
--- a/test/case/ietf_system/ssh_key_authentication/Readme.adoc
+++ b/test/case/infix_services/ssh_key_authentication/Readme.adoc
@@ -4,7 +4,7 @@ Verify that 'guest' user can fetch data using only the 'public' key
 
 ==== Topology
 ifdef::topdoc[]
-image::../../test/case/ietf_system/ssh_key_authentication/topology.svg[Generate ssh key pair topology]
+image::../../test/case/infix_services/ssh_key_authentication/topology.svg[Generate ssh key pair topology]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
diff --git a/test/case/ietf_system/ssh_key_authentication/test.py b/test/case/infix_services/ssh_key_authentication/test.py
similarity index 100%
rename from test/case/ietf_system/ssh_key_authentication/test.py
rename to test/case/infix_services/ssh_key_authentication/test.py
diff --git a/test/case/ietf_system/ssh_key_authentication/topology.dot b/test/case/infix_services/ssh_key_authentication/topology.dot
similarity index 100%
rename from test/case/ietf_system/ssh_key_authentication/topology.dot
rename to test/case/infix_services/ssh_key_authentication/topology.dot
diff --git a/test/case/ietf_system/ssh_key_authentication/topology.svg b/test/case/infix_services/ssh_key_authentication/topology.svg
similarity index 100%
rename from test/case/ietf_system/ssh_key_authentication/topology.svg
rename to test/case/infix_services/ssh_key_authentication/topology.svg