diff --git a/tests/main/interfaces-account-control/account-control-consumer-core18/bin/deluser b/tests/main/interfaces-account-control/account-control-consumer-core18/bin/deluser
deleted file mode 100755
index 10797bca0ad..00000000000
--- a/tests/main/interfaces-account-control/account-control-consumer-core18/bin/deluser
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/sbin/deluser "$@"
diff --git a/tests/main/interfaces-account-control/account-control-consumer-core18/bin/userdel b/tests/main/interfaces-account-control/account-control-consumer-core18/bin/userdel
new file mode 100755
index 00000000000..7142de65a58
--- /dev/null
+++ b/tests/main/interfaces-account-control/account-control-consumer-core18/bin/userdel
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/sbin/userdel "$@"
diff --git a/tests/main/interfaces-account-control/account-control-consumer-core18/meta/snap.yaml b/tests/main/interfaces-account-control/account-control-consumer-core18/meta/snap.yaml
index c7f71229384..9e8e645a702 100644
--- a/tests/main/interfaces-account-control/account-control-consumer-core18/meta/snap.yaml
+++ b/tests/main/interfaces-account-control/account-control-consumer-core18/meta/snap.yaml
@@ -8,8 +8,8 @@ apps:
   useradd:
     command: bin/useradd
     plugs: [account-control]
-  deluser:
-    command: bin/deluser
+  userdel:
+    command: bin/userdel
     plugs: [account-control]
   chpasswd:
     command: bin/chpasswd
diff --git a/tests/main/interfaces-account-control/account-control-consumer-core20/bin/deluser b/tests/main/interfaces-account-control/account-control-consumer-core20/bin/deluser
deleted file mode 100755
index 10797bca0ad..00000000000
--- a/tests/main/interfaces-account-control/account-control-consumer-core20/bin/deluser
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/sbin/deluser "$@"
diff --git a/tests/main/interfaces-account-control/account-control-consumer-core20/bin/userdel b/tests/main/interfaces-account-control/account-control-consumer-core20/bin/userdel
new file mode 100755
index 00000000000..7142de65a58
--- /dev/null
+++ b/tests/main/interfaces-account-control/account-control-consumer-core20/bin/userdel
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/sbin/userdel "$@"
diff --git a/tests/main/interfaces-account-control/account-control-consumer-core20/meta/snap.yaml b/tests/main/interfaces-account-control/account-control-consumer-core20/meta/snap.yaml
index c145ae2ef1f..f69d6e03bb6 100644
--- a/tests/main/interfaces-account-control/account-control-consumer-core20/meta/snap.yaml
+++ b/tests/main/interfaces-account-control/account-control-consumer-core20/meta/snap.yaml
@@ -8,8 +8,8 @@ apps:
   useradd:
     command: bin/useradd
     plugs: [account-control]
-  deluser:
-    command: bin/deluser
+  userdel:
+    command: bin/userdel
     plugs: [account-control]
   chpasswd:
     command: bin/chpasswd
diff --git a/tests/main/interfaces-account-control/account-control-consumer-core22/bin/deluser b/tests/main/interfaces-account-control/account-control-consumer-core22/bin/deluser
deleted file mode 100755
index 10797bca0ad..00000000000
--- a/tests/main/interfaces-account-control/account-control-consumer-core22/bin/deluser
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/sbin/deluser "$@"
diff --git a/tests/main/interfaces-account-control/account-control-consumer-core22/bin/userdel b/tests/main/interfaces-account-control/account-control-consumer-core22/bin/userdel
new file mode 100755
index 00000000000..7142de65a58
--- /dev/null
+++ b/tests/main/interfaces-account-control/account-control-consumer-core22/bin/userdel
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/sbin/userdel "$@"
diff --git a/tests/main/interfaces-account-control/account-control-consumer-core22/meta/snap.yaml b/tests/main/interfaces-account-control/account-control-consumer-core22/meta/snap.yaml
index eae2fc44d35..41613ff4e83 100644
--- a/tests/main/interfaces-account-control/account-control-consumer-core22/meta/snap.yaml
+++ b/tests/main/interfaces-account-control/account-control-consumer-core22/meta/snap.yaml
@@ -8,8 +8,8 @@ apps:
   useradd:
     command: bin/useradd
     plugs: [account-control]
-  deluser:
-    command: bin/deluser
+  userdel:
+    command: bin/userdel
     plugs: [account-control]
   chpasswd:
     command: bin/chpasswd
diff --git a/tests/main/interfaces-account-control/account-control-consumer-core24/bin/deluser b/tests/main/interfaces-account-control/account-control-consumer-core24/bin/deluser
deleted file mode 100755
index 10797bca0ad..00000000000
--- a/tests/main/interfaces-account-control/account-control-consumer-core24/bin/deluser
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/sbin/deluser "$@"
diff --git a/tests/main/interfaces-account-control/account-control-consumer-core24/bin/userdel b/tests/main/interfaces-account-control/account-control-consumer-core24/bin/userdel
new file mode 100755
index 00000000000..7142de65a58
--- /dev/null
+++ b/tests/main/interfaces-account-control/account-control-consumer-core24/bin/userdel
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/sbin/userdel "$@"
diff --git a/tests/main/interfaces-account-control/account-control-consumer-core24/meta/snap.yaml b/tests/main/interfaces-account-control/account-control-consumer-core24/meta/snap.yaml
index 360fc9dd30d..1cbd7c9eca3 100644
--- a/tests/main/interfaces-account-control/account-control-consumer-core24/meta/snap.yaml
+++ b/tests/main/interfaces-account-control/account-control-consumer-core24/meta/snap.yaml
@@ -8,8 +8,8 @@ apps:
   useradd:
     command: bin/useradd
     plugs: [account-control]
-  deluser:
-    command: bin/deluser
+  userdel:
+    command: bin/userdel
     plugs: [account-control]
   chpasswd:
     command: bin/chpasswd
diff --git a/tests/main/interfaces-account-control/account-control-consumer-core26/bin/deluser b/tests/main/interfaces-account-control/account-control-consumer-core26/bin/deluser
deleted file mode 100755
index 10797bca0ad..00000000000
--- a/tests/main/interfaces-account-control/account-control-consumer-core26/bin/deluser
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/sbin/deluser "$@"
diff --git a/tests/main/interfaces-account-control/account-control-consumer-core26/bin/userdel b/tests/main/interfaces-account-control/account-control-consumer-core26/bin/userdel
new file mode 100755
index 00000000000..7142de65a58
--- /dev/null
+++ b/tests/main/interfaces-account-control/account-control-consumer-core26/bin/userdel
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/sbin/userdel "$@"
diff --git a/tests/main/interfaces-account-control/account-control-consumer-core26/meta/snap.yaml b/tests/main/interfaces-account-control/account-control-consumer-core26/meta/snap.yaml
index 029da578821..5f0943e842b 100644
--- a/tests/main/interfaces-account-control/account-control-consumer-core26/meta/snap.yaml
+++ b/tests/main/interfaces-account-control/account-control-consumer-core26/meta/snap.yaml
@@ -8,8 +8,8 @@ apps:
   useradd:
     command: bin/useradd
     plugs: [account-control]
-  deluser:
-    command: bin/deluser
+  userdel:
+    command: bin/userdel
     plugs: [account-control]
   chpasswd:
     command: bin/chpasswd
diff --git a/tests/main/interfaces-account-control/account-control-consumer/bin/deluser b/tests/main/interfaces-account-control/account-control-consumer/bin/deluser
deleted file mode 100755
index 10797bca0ad..00000000000
--- a/tests/main/interfaces-account-control/account-control-consumer/bin/deluser
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/sbin/deluser "$@"
diff --git a/tests/main/interfaces-account-control/account-control-consumer/bin/userdel b/tests/main/interfaces-account-control/account-control-consumer/bin/userdel
new file mode 100755
index 00000000000..7142de65a58
--- /dev/null
+++ b/tests/main/interfaces-account-control/account-control-consumer/bin/userdel
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/sbin/userdel "$@"
diff --git a/tests/main/interfaces-account-control/account-control-consumer/meta/snap.yaml b/tests/main/interfaces-account-control/account-control-consumer/meta/snap.yaml
index 190cfc772e9..44b6c59a075 100644
--- a/tests/main/interfaces-account-control/account-control-consumer/meta/snap.yaml
+++ b/tests/main/interfaces-account-control/account-control-consumer/meta/snap.yaml
@@ -7,8 +7,8 @@ apps:
   useradd:
     command: bin/useradd
     plugs: [account-control]
-  deluser:
-    command: bin/deluser
+  userdel:
+    command: bin/userdel
     plugs: [account-control]
   chpasswd:
     command: bin/chpasswd
diff --git a/tests/main/interfaces-account-control/task.yaml b/tests/main/interfaces-account-control/task.yaml
index a73353044eb..1f8659fe0c2 100644
--- a/tests/main/interfaces-account-control/task.yaml
+++ b/tests/main/interfaces-account-control/task.yaml
@@ -4,7 +4,7 @@ details: |
     This test makes sure that a snap using the account-control interface
     can handle the user accounts properly.
 
-systems: [ubuntu-core-16-64, ubuntu-core-18-64, ubuntu-core-20-64, ubuntu-core-22-64, ubuntu-core-24-64, ubuntu-core-26-64]
+systems: [ubuntu-core-*]
 
 environment:
     TSNAP: account-control-consumer
@@ -42,5 +42,4 @@ execute: |
     snap run "${TSNAP}${SUFFIX}".useradd --extrausers alice
     echo alice:password | snap run "${TSNAP}${SUFFIX}".chpasswd
 
-    # User deletion is unsupported yet on Core: https://bugs.launchpad.net/ubuntu/+source/shadow/+bug/1659534
-    # snap run "${TSNAP}${SUFFIX}".userdel --extrausers alice
+    snap run "${TSNAP}${SUFFIX}".userdel --extrausers alice