diff --git a/tests/acpi-test-data/pc/NFIT b/tests/acpi-test-data/pc/NFIT
new file mode 100644
index 0000000000000000000000000000000000000000..2d2a190bd0a603dac228177428f4884e23393a7c
GIT binary patch
diff --git a/tests/acpi-test-data/pc/NFIT.bridge b/tests/acpi-test-data/pc/NFIT.bridge
new file mode 100644
index 0000000000000000000000000000000000000000..2d2a190bd0a603dac228177428f4884e23393a7c
GIT binary patch
diff --git a/tests/acpi-test-data/pc/SSDT b/tests/acpi-test-data/pc/SSDT
index 210d6a71e58aa34ce8e94121d25bcf58c3bd503c..83c5fcc88786f3f8c2ccb3e1fd935ab6b940cbf8 100644
GIT binary patch
diff --git a/tests/acpi-test-data/pc/SSDT-NVDIMM b/tests/acpi-test-data/pc/SSDT-NVDIMM
new file mode 100644
index 0000000000000000000000000000000000000000..22265278c3a4df9e9fee0ea9e04b37f2c80baa29
GIT binary patch
diff --git a/tests/acpi-test-data/pc/SSDT-NVDIMM.bridge b/tests/acpi-test-data/pc/SSDT-NVDIMM.bridge
new file mode 100644
index 0000000000000000000000000000000000000000..22265278c3a4df9e9fee0ea9e04b37f2c80baa29
GIT binary patch
diff --git a/tests/acpi-test-data/pc/SSDT.bridge b/tests/acpi-test-data/pc/SSDT.bridge
index 6e6660b1fbe0bdb7fe0b257cb53c31fa9bb21a14..051c2e34aebbe6214a8c1e37b39f744bb4943051 100644
GIT binary patch
diff --git a/tests/acpi-test-data/q35/NFIT b/tests/acpi-test-data/q35/NFIT
new file mode 100644
index 0000000000000000000000000000000000000000..2d2a190bd0a603dac228177428f4884e23393a7c
GIT binary patch
diff --git a/tests/acpi-test-data/q35/NFIT.bridge b/tests/acpi-test-data/q35/NFIT.bridge
new file mode 100644
index 0000000000000000000000000000000000000000..2d2a190bd0a603dac228177428f4884e23393a7c
GIT binary patch
diff --git a/tests/acpi-test-data/q35/SSDT b/tests/acpi-test-data/q35/SSDT
index 0970c67ddb1456707c0111f7e5e659ef385af408..f75d0745ce6d34ae7416409d4f8f42402e6c20b6 100644
GIT binary patch
diff --git a/tests/acpi-test-data/q35/SSDT-NVDIMM b/tests/acpi-test-data/q35/SSDT-NVDIMM
new file mode 100644
index 0000000000000000000000000000000000000000..22265278c3a4df9e9fee0ea9e04b37f2c80baa29
GIT binary patch
diff --git a/tests/acpi-test-data/q35/SSDT-NVDIMM.bridge b/tests/acpi-test-data/q35/SSDT-NVDIMM.bridge
new file mode 100644
index 0000000000000000000000000000000000000000..22265278c3a4df9e9fee0ea9e04b37f2c80baa29
GIT binary patch
diff --git a/tests/acpi-test-data/q35/SSDT.bridge b/tests/acpi-test-data/q35/SSDT.bridge
index a77868861754ce0b3333b2b7bc8091c03a53754d..87586ac9455a4933fc2a069e98a19e07cbf04670 100644
GIT binary patch
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index fc01cce..87cf2e5 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -157,6 +157,10 @@ static const char *iasl = stringify(CONFIG_IASL);
 static const char *iasl;
 #endif
 
+#define NVDIMM_PARAMS   " -m 128M,maxmem=5G,slots=2 "                   \
+                        "-object memory-backend-ram,id=mem1,size=128M " \
+                        "-device nvdimm,memdev=mem1"
+
 static void free_test_data(test_data *data)
 {
     AcpiSdtTable *temp;
@@ -823,7 +827,7 @@ static void test_acpi_piix4_tcg(void)
      */
     memset(&data, 0, sizeof(data));
     data.machine = MACHINE_PC;
-    test_acpi_one("-machine accel=tcg", &data);
+    test_acpi_one("-machine accel=tcg,nvdimm" NVDIMM_PARAMS, &data);
     free_test_data(&data);
 }
 
@@ -834,7 +838,8 @@ static void test_acpi_piix4_tcg_bridge(void)
     memset(&data, 0, sizeof(data));
     data.machine = MACHINE_PC;
     data.variant = ".bridge";
-    test_acpi_one("-machine accel=tcg -device pci-bridge,chassis_nr=1", &data);
+    test_acpi_one("-machine accel=tcg,nvdimm -device pci-bridge,chassis_nr=1"
+                  NVDIMM_PARAMS, &data);
     free_test_data(&data);
 }
 
@@ -844,7 +849,7 @@ static void test_acpi_q35_tcg(void)
 
     memset(&data, 0, sizeof(data));
     data.machine = MACHINE_Q35;
-    test_acpi_one("-machine q35,accel=tcg", &data);
+    test_acpi_one("-machine q35,accel=tcg,nvdimm" NVDIMM_PARAMS, &data);
     free_test_data(&data);
 }
 
@@ -855,8 +860,8 @@ static void test_acpi_q35_tcg_bridge(void)
     memset(&data, 0, sizeof(data));
     data.machine = MACHINE_Q35;
     data.variant = ".bridge";
-    test_acpi_one("-machine q35,accel=tcg -device pci-bridge,chassis_nr=1",
-                  &data);
+    test_acpi_one("-machine q35,accel=tcg,nvdimm "
+                  "-device pci-bridge,chassis_nr=1" NVDIMM_PARAMS, &data);
     free_test_data(&data);
 }
 
