diff --git a/test/case/statd/system/ietf-system.json b/test/case/statd/system/ietf-system.json
index 313356b3..f317f5b8 100644
--- a/test/case/statd/system/ietf-system.json
+++ b/test/case/statd/system/ietf-system.json
@@ -1,4 +1,15 @@
 {
+  "ietf-system:system": {
+    "hostname": "target",
+    "authentication": {
+      "user": [
+        {
+          "name": "admin",
+          "password": "$5$mI/zpOAqZYKLC2WU$i7iPzZiIjOjrBF3NyftS9CCq8dfYwHwrmUK097Jca9A"
+        }
+      ]
+    }
+  },
   "ietf-system:system-state": {
     "infix-system:software": {
       "compatible": "infix-x86_64",
@@ -95,25 +106,25 @@
       }
     },
     "infix-system:dns-resolver": {
-      "options": {
-        "timeout": 3,
-        "attempts": 5
-      },
+      "options": {},
       "server": [
-        {
-          "address": "1.2.3.4",
-          "origin": "static"
-        },
         {
           "address": "192.168.2.1",
           "origin": "dhcp",
           "interface": "e7"
         }
       ],
-      "search": [
-        "example.com",
-        "kernelkit.org"
-      ]
+      "search": []
+    },
+    "clock": {
+      "boot-datetime": "2025-04-23T11:42:01+00:00",
+      "current-datetime": "2025-04-23T11:42:27+00:00"
+    },
+    "platform": {
+      "os-name": "Infix",
+      "os-version": "v25.03.0-48-gfb8e3e5b-dirty",
+      "os-release": "v25.03.0-48-gfb8e3e5b-dirty",
+      "machine": "x86_64"
     }
   }
 }
diff --git a/test/case/statd/system/operational.json b/test/case/statd/system/operational.json
index 47da2c65..e8ff7d87 100644
--- a/test/case/statd/system/operational.json
+++ b/test/case/statd/system/operational.json
@@ -23,7 +23,33 @@
       }
     ]
   },
+  "ietf-system:system": {
+    "authentication": {
+      "user": [
+        {
+          "name": "admin",
+          "password": "$5$mI/zpOAqZYKLC2WU$i7iPzZiIjOjrBF3NyftS9CCq8dfYwHwrmUK097Jca9A"
+        }
+      ]
+    },
+    "hostname": "target"
+  },
   "ietf-system:system-state": {
+    "clock": {
+      "boot-datetime": "2025-04-23T11:42:01+00:00",
+      "current-datetime": "2025-04-23T11:42:27+00:00"
+    },
+    "infix-system:dns-resolver": {
+      "options": {},
+      "search": [],
+      "server": [
+        {
+          "address": "192.168.2.1",
+          "interface": "e7",
+          "origin": "dhcp"
+        }
+      ]
+    },
     "infix-system:ntp": {
       "sources": {
         "source": [
@@ -117,6 +143,12 @@
         }
       ],
       "variant": ""
+    },
+    "platform": {
+      "machine": "x86_64",
+      "os-name": "Infix",
+      "os-release": "v25.03.0-48-gfb8e3e5b-dirty",
+      "os-version": "v25.03.0-48-gfb8e3e5b-dirty"
     }
   }
 }
diff --git a/test/case/statd/system/system/rootfs/etc/os-release b/test/case/statd/system/system/rootfs/etc/os-release
new file mode 100644
index 00000000..fcea5eef
--- /dev/null
+++ b/test/case/statd/system/system/rootfs/etc/os-release
@@ -0,0 +1,16 @@
+NAME="Infix"
+ID=infix
+PRETTY_NAME="Infix -- a Network Operating System v25.03.0-48-gfb8e3e5b-dirty"
+ID_LIKE="buildroot"
+DEFAULT_HOSTNAME=ix
+VERSION="v25.03.0-48-gfb8e3e5b-dirty"
+VERSION_ID=v25.03.0-48-gfb8e3e5b-dirty
+BUILD_ID="v25.03.0-48-gfb8e3e5b-dirty"
+IMAGE_ID="infix-x86_64"
+ARCHITECTURE="x86_64"
+HOME_URL=https://github.com/kernelkit/infix/
+VENDOR_NAME="KernelKit"
+VENDOR_HOME="https://github.com/kernelkit"
+DOCUMENTATION_URL="https://github.com/kernelkit/infix/tree/main/doc"
+SUPPORT_URL="mailto:kernelkit@googlegroups.com"
+INFIX_DESC="Infix is a Network Operating System based on Linux.  It can be set up both as a switch, with offloading using switchdev, and a router with firewalling."
diff --git a/test/case/statd/system/system/rootfs/etc/resolv.conf.head b/test/case/statd/system/system/rootfs/etc/resolv.conf.head
index 92d3ceb7..e69de29b 100644
--- a/test/case/statd/system/system/rootfs/etc/resolv.conf.head
+++ b/test/case/statd/system/system/rootfs/etc/resolv.conf.head
@@ -1,3 +0,0 @@
-options timeout:3 attempts:5 
-search example.com kernelkit.org 
-nameserver 1.2.3.4
diff --git a/test/case/statd/system/system/rootfs/proc/uptime b/test/case/statd/system/system/rootfs/proc/uptime
new file mode 100644
index 00000000..1ecb3dff
--- /dev/null
+++ b/test/case/statd/system/system/rootfs/proc/uptime
@@ -0,0 +1 @@
+25.89 16.45
diff --git a/test/case/statd/system/system/run/getent_shadow b/test/case/statd/system/system/run/getent_shadow
new file mode 100644
index 00000000..a286e12d
--- /dev/null
+++ b/test/case/statd/system/system/run/getent_shadow
@@ -0,0 +1,17 @@
+root:*:::::::
+daemon:*:::::::
+bin:*:::::::
+sys:*:::::::
+sync:*:::::::
+mail:*:::::::
+www-data:*:::::::
+sys-cli:*:::::::
+backup:*:::::::
+nobody:*:::::::
+yangnobody:*:::::::
+avahi:*:::::::
+chrony:*:::::::
+dbus:*:::::::
+frr:*:::::::
+sshd:*:::::::
+admin:$5$mI/zpOAqZYKLC2WU$i7iPzZiIjOjrBF3NyftS9CCq8dfYwHwrmUK097Jca9A:::::::
diff --git a/test/case/statd/system/system/run/hostname b/test/case/statd/system/system/run/hostname
new file mode 100644
index 00000000..eb5a316c
--- /dev/null
+++ b/test/case/statd/system/system/run/hostname
@@ -0,0 +1 @@
+target
diff --git a/test/case/statd/system/system/timestamp b/test/case/statd/system/system/timestamp
new file mode 100644
index 00000000..98aa002e
--- /dev/null
+++ b/test/case/statd/system/system/timestamp
@@ -0,0 +1,2 @@
+1745408547
+