diff --git a/tests/drivers/pci_enum/Makefile b/tests/drivers/pci_enum/Makefile
index 65ecc54b9da..cfa14bde5ba 100644
--- a/tests/drivers/pci_enum/Makefile
+++ b/tests/drivers/pci_enum/Makefile
@@ -1,5 +1,9 @@
 BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
+# In QEMU x86, we have to force CONFIG_PCI being defined, as the defconfig does not have it.
+ifeq ($(BOARD), qemu_x86)
+CONF_FILE = prj_$(BOARD).conf
+else
 CONF_FILE = prj.conf
+endif
 
 include ${ZEPHYR_BASE}/Makefile.inc
diff --git a/tests/drivers/pci_enum/prj.conf b/tests/drivers/pci_enum/prj.conf
index a6d8fd65900..47d184679a4 100644
--- a/tests/drivers/pci_enum/prj.conf
+++ b/tests/drivers/pci_enum/prj.conf
@@ -1,3 +1,4 @@
 CONFIG_STDOUT_CONSOLE=y
 CONFIG_PCI_ENUMERATION=y
 CONFIG_PCI_DEBUG=y
+CONFIG_ZTEST=y
diff --git a/tests/drivers/pci_enum/prj.mdef b/tests/drivers/pci_enum/prj.mdef
deleted file mode 100644
index 2c0e874b092..00000000000
--- a/tests/drivers/pci_enum/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : PCI enumeration application
-
-% TASK NAME  PRIO ENTRY          STACK GROUPS
-% ===========================================
-  TASK TASKA    7 task_enum_pci  1024  [EXE]
diff --git a/tests/drivers/pci_enum/prj_qemu_x86.conf b/tests/drivers/pci_enum/prj_qemu_x86.conf
new file mode 100644
index 00000000000..d99da04aca8
--- /dev/null
+++ b/tests/drivers/pci_enum/prj_qemu_x86.conf
@@ -0,0 +1,5 @@
+CONFIG_PCI=y
+CONFIG_STDOUT_CONSOLE=y
+CONFIG_PCI_ENUMERATION=y
+CONFIG_PCI_DEBUG=y
+CONFIG_ZTEST=y
diff --git a/tests/drivers/pci_enum/sample.tc b/tests/drivers/pci_enum/sample.tc
deleted file mode 100644
index 4f93166d4e8..00000000000
--- a/tests/drivers/pci_enum/sample.tc
+++ /dev/null
@@ -1,5 +0,0 @@
-# @testcase dynamic
-# @targets \
-#    board:(galileo|qemu_x86|qemu_cortex_m3)
-#
-# @eval console-rx %(console)s:20 Enumeration complete on %(bsp)s
diff --git a/tests/drivers/pci_enum/src/Makefile b/tests/drivers/pci_enum/src/Makefile
index da87cdd861c..9c9ca147394 100644
--- a/tests/drivers/pci_enum/src/Makefile
+++ b/tests/drivers/pci_enum/src/Makefile
@@ -1,3 +1,3 @@
+include $(ZEPHYR_BASE)/tests/Makefile.test
 ccflags-y += -I${ZEPHYR_BASE}/include/drivers
-
 obj-y = pci_enum.o
diff --git a/tests/drivers/pci_enum/src/pci_enum.c b/tests/drivers/pci_enum/src/pci_enum.c
index 024a97d3911..0fa7eef230d 100644
--- a/tests/drivers/pci_enum/src/pci_enum.c
+++ b/tests/drivers/pci_enum/src/pci_enum.c
@@ -15,12 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <zephyr.h>
-#include <stdint.h>
-#include <misc/printk.h>
+#include <ztest.h>
 #include <pci/pci.h>
 
-void pci_enumerate(void)
+static void pci_enumerate(void)
 {
 	struct pci_dev_info info = {
 		.function = PCI_FUNCTION_ANY,
@@ -39,28 +37,8 @@ void pci_enumerate(void)
 	}
 }
 
-#ifdef CONFIG_MICROKERNEL
-
-
-static int done;
-
-void task_enum_pci(void)
+void test_main(void)
 {
-	if (done) {
-		task_yield();
-	}
-
-	pci_enumerate();
-	printk("Enumeration complete on %s", CONFIG_ARCH);
-	done = 1;
+	ztest_test_suite(pci_test, ztest_unit_test(pci_enumerate));
+	ztest_run_test_suite(pci_test);
 }
-
-#else /* CONFIG_NANOKERNEL */
-
-void main(void)
-{
-	pci_enumerate();
-	printk("Enumeration complete on %s", CONFIG_ARCH);
-}
-
-#endif /* CONFIG_MICROKERNEL */
diff --git a/tests/drivers/pci_enum/testcase.ini b/tests/drivers/pci_enum/testcase.ini
index 6bd7dcb467c..1717189cd04 100644
--- a/tests/drivers/pci_enum/testcase.ini
+++ b/tests/drivers/pci_enum/testcase.ini
@@ -1,4 +1,4 @@
 [test]
-build_only = true
 tags = samples
 filter = CONFIG_PCI
+platform_whitelist = qemu_x86 galileo