diff --git a/tests/lib/names.sh b/tests/lib/names.sh
index a1a6e80e4e3..9a0a6e5d70f 100644
--- a/tests/lib/names.sh
+++ b/tests/lib/names.sh
@@ -1,8 +1,4 @@
 #!/bin/bash
 
-gadget_name=$(snap list | sed -n 's/^\(pc\|pi[23]\|dragonboard\|cm3\) .*/\1/p')
-kernel_name=$gadget_name-kernel
-
-if [ "$kernel_name" = "pi3-kernel" ] || [ "$kernel_name" = "cm3-kernel" ]; then
-    kernel_name=pi2-kernel
-fi
+gadget_name=$(snap list | grep 'gadget$' | awk '{ print $1 }')
+kernel_name=$(snap list | grep 'kernel$' | awk '{ print $1 }')