diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/offline b/tests/virhostcpudata/linux-deconf-cpus/cpu/offline
deleted file mode 100644
index b74672a3de549292c1b7b857a9f34c74cf2251d2..0000000000000000000000000000000000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/offline
+++ /dev/null
@@ -1 +0,0 @@
-0-15,17-23,25-39,41-47,49-71,73-103,105-111,113-119,121-127,129-135,137-159
diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/possible b/tests/virhostcpudata/linux-deconf-cpus/cpu/possible
deleted file mode 100644
index 7a662d6ab5c2eeb2ce54750b7991459773e35155..0000000000000000000000000000000000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/possible
+++ /dev/null
@@ -1 +0,0 @@
-0-159
diff --git a/tests/virhostcpudata/linux-f21-mustang/cpu/offline b/tests/virhostcpudata/linux-f21-mustang/cpu/offline
deleted file mode 100644
index 8b137891791fe96927ad78e64b0aad7bded08bdc..0000000000000000000000000000000000000000
--- a/tests/virhostcpudata/linux-f21-mustang/cpu/offline
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tests/virhostcpudata/linux-f21-mustang/cpu/possible b/tests/virhostcpudata/linux-f21-mustang/cpu/possible
deleted file mode 100644
index 74fc2fb6b048c39d90b0c17de3824095162634f8..0000000000000000000000000000000000000000
--- a/tests/virhostcpudata/linux-f21-mustang/cpu/possible
+++ /dev/null
@@ -1 +0,0 @@
-0-7
diff --git a/tests/virhostcpudata/linux-raspberrypi/cpu/offline b/tests/virhostcpudata/linux-raspberrypi/cpu/offline
deleted file mode 100644
index 8b137891791fe96927ad78e64b0aad7bded08bdc..0000000000000000000000000000000000000000
--- a/tests/virhostcpudata/linux-raspberrypi/cpu/offline
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tests/virhostcpudata/linux-raspberrypi/cpu/possible b/tests/virhostcpudata/linux-raspberrypi/cpu/possible
deleted file mode 100644
index 573541ac9702dd3969c9bc859d2b91ec1f7e6e56..0000000000000000000000000000000000000000
--- a/tests/virhostcpudata/linux-raspberrypi/cpu/possible
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/offline b/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/offline
deleted file mode 100644
index 8b137891791fe96927ad78e64b0aad7bded08bdc..0000000000000000000000000000000000000000
--- a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/offline
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/possible b/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/possible
deleted file mode 100644
index 74fc2fb6b048c39d90b0c17de3824095162634f8..0000000000000000000000000000000000000000
--- a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/possible
+++ /dev/null
@@ -1 +0,0 @@
-0-7
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/offline b/tests/virhostcpudata/linux-subcores1/cpu/offline
deleted file mode 100644
index c15c0562055f078126fda772278bdb1d299564f7..0000000000000000000000000000000000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/offline
+++ /dev/null
@@ -1 +0,0 @@
-1-7,9-15,17-23,25-31,33-39,41-47,49-55,57-63,65-71,73-79,81-87,89-95,97-103,105-111,113-119,121-127,129-135,137-143,145-151,153-159
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/possible b/tests/virhostcpudata/linux-subcores1/cpu/possible
deleted file mode 100644
index 7a662d6ab5c2eeb2ce54750b7991459773e35155..0000000000000000000000000000000000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/possible
+++ /dev/null
@@ -1 +0,0 @@
-0-159
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/offline b/tests/virhostcpudata/linux-subcores2/cpu/offline
deleted file mode 100644
index eadee0c92b6cbd05f9ea2281cb7498a1f4b56874..0000000000000000000000000000000000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/offline
+++ /dev/null
@@ -1 +0,0 @@
-1-7,9-15,17-23,25-31,33-47,49-95,97-135,137-159
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/possible b/tests/virhostcpudata/linux-subcores2/cpu/possible
deleted file mode 100644
index 7a662d6ab5c2eeb2ce54750b7991459773e35155..0000000000000000000000000000000000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/possible
+++ /dev/null
@@ -1 +0,0 @@
-0-159
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/offline b/tests/virhostcpudata/linux-subcores3/cpu/offline
deleted file mode 100644
index 74796ec8b312d35215c4abd78c0e10df90ffd0a1..0000000000000000000000000000000000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/offline
+++ /dev/null
@@ -1 +0,0 @@
-0-7,9-39,41-47,49-55,57-67,69-71,73-79,81-87,89-95,97-103,105-111,113-127,129-135,137-151
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/possible b/tests/virhostcpudata/linux-subcores3/cpu/possible
deleted file mode 100644
index 7a662d6ab5c2eeb2ce54750b7991459773e35155..0000000000000000000000000000000000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/possible
+++ /dev/null
@@ -1 +0,0 @@
-0-159
diff --git a/tests/virhostcpudata/linux-test8/cpu/offline b/tests/virhostcpudata/linux-test8/cpu/offline
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/possible b/tests/virhostcpudata/linux-test8/cpu/possible
deleted file mode 100644
index 3498c1f2daa5db3417479c76edcf53ad823b471a..0000000000000000000000000000000000000000
--- a/tests/virhostcpudata/linux-test8/cpu/possible
+++ /dev/null
@@ -1 +0,0 @@
-0-63