diff --git a/tests/cputestdata/cpu-gather.py b/tests/cputestdata/cpu-gather.py
index 5c03d226b6..ea1d42f1ec 100755
--- a/tests/cputestdata/cpu-gather.py
+++ b/tests/cputestdata/cpu-gather.py
@@ -117,7 +117,21 @@ def gather_static_model(args):
 
 def gather_full_model(args, static_model):
     if static_model:
-        return []
+        return call_qemu(args.path_to_qemu, [
+            {
+                "execute": "query-cpu-model-expansion",
+                "arguments":
+                {
+                    "type": "full",
+                    "model": static_model
+                },
+                "id": "model-expansion"
+            },
+            {
+                "execute": "query-cpu-definitions",
+                "id": "definitions"
+            }
+        ])
     else:
         return call_qemu(args.path_to_qemu, [
             {
diff --git a/tests/cputestdata/cpu-gather.sh b/tests/cputestdata/cpu-gather.sh
index 05faf14a96..5cef26c8e6 100755
--- a/tests/cputestdata/cpu-gather.sh
+++ b/tests/cputestdata/cpu-gather.sh
@@ -4,23 +4,3 @@ if [ -z "${CPU_GATHER_PY}" ]; then
     echo >&2 "Do not call this script directly. Use 'cpu-gather.py' instead."
     exit 1
 fi
-
-model_expansion()
-{
-    mode=$1
-    model=$2
-
-    echo '{"execute":"query-cpu-model-expansion","arguments":' \
-         '{"type":"'"$mode"'","model":'"$model"'},"id":"model-expansion"}'
-}
-
-$qemu -machine accel=kvm -cpu host -nodefaults -nographic -qmp stdio <<EOF
-{"execute":"qmp_capabilities"}
-$(
-    if [ "x$model" != x ]; then
-        model_expansion full "$model"
-    fi
-)
-{"execute":"query-cpu-definitions","id":"definitions"}
-{"execute":"quit"}
-EOF