diff --git a/vpnor/Makefile.am.include b/vpnor/Makefile.am.include
index edb97b7..0f3de00 100644
--- a/vpnor/Makefile.am.include
+++ b/vpnor/Makefile.am.include
@@ -2,7 +2,8 @@
 	%reldir%/mboxd_pnor_partition_table.cpp \
 	%reldir%/mboxd_flash.cpp \
 	%reldir%/pnor_partition.cpp \
-	%reldir%/mboxd_lpc_reset.cpp
+	%reldir%/mboxd_lpc_reset.cpp \
+	%reldir%/mboxd_msg.cpp
 
 mboxd_LDFLAGS += -lstdc++fs \
 	$(SDBUSPLUS_LIBS) \
diff --git a/vpnor/mboxd_msg.cpp b/vpnor/mboxd_msg.cpp
new file mode 100644
index 0000000..130c098
--- /dev/null
+++ b/vpnor/mboxd_msg.cpp
@@ -0,0 +1,24 @@
+#include "config.h"
+
+extern "C" {
+#include "mbox.h"
+#include "mboxd_msg.h"
+};
+
+#include "vpnor/mboxd_msg.hpp"
+
+// clang-format off
+const mboxd_mbox_handler vpnor_mbox_handlers[NUM_MBOX_CMDS] =
+{
+	mbox_handle_reset,
+	mbox_handle_mbox_info,
+	mbox_handle_flash_info,
+	mbox_handle_read_window,
+	mbox_handle_close_window,
+	mbox_handle_write_window,
+	mbox_handle_dirty_window,
+	mbox_handle_flush_window,
+	mbox_handle_ack,
+	mbox_handle_erase_window
+};
+// clang-format on
diff --git a/vpnor/mboxd_msg.hpp b/vpnor/mboxd_msg.hpp
new file mode 100644
index 0000000..7485c38
--- /dev/null
+++ b/vpnor/mboxd_msg.hpp
@@ -0,0 +1,5 @@
+extern "C" {
+#include "mbox.h"
+
+extern const mboxd_mbox_handler vpnor_mbox_handlers[NUM_MBOX_CMDS];
+};
diff --git a/vpnor/mboxd_pnor_partition_table.cpp b/vpnor/mboxd_pnor_partition_table.cpp
index db53dc8..fad0c7f 100644
--- a/vpnor/mboxd_pnor_partition_table.cpp
+++ b/vpnor/mboxd_pnor_partition_table.cpp
@@ -10,6 +10,7 @@
 #include "xyz/openbmc_project/Common/error.hpp"
 #include <phosphor-logging/elog-errors.hpp>
 #include <experimental/filesystem>
+#include "vpnor/mboxd_msg.hpp"
 
 int init_vpnor(struct mbox_context *context)
 {
@@ -44,6 +45,8 @@
 
     if (context && !context->vpnor)
     {
+        context->handlers = vpnor_mbox_handlers;
+
         try
         {
             context->vpnor = new vpnor_partition_table;
diff --git a/vpnor/test/Makefile.am.include b/vpnor/test/Makefile.am.include
index 9a81d9c..85b2cbc 100644
--- a/vpnor/test/Makefile.am.include
+++ b/vpnor/test/Makefile.am.include
@@ -11,6 +11,7 @@
 	vpnor/mboxd_lpc_reset.cpp \
 	vpnor/mboxd_pnor_partition_table.cpp \
 	vpnor/mboxd_flash.cpp \
+	vpnor/mboxd_msg.cpp \
 	vpnor/pnor_partition.cpp \
 	vpnor/pnor_partition_table.cpp \
 	%reldir%/tmpd.cpp
@@ -35,41 +36,29 @@
 vpnor_test_create_read_window_partition_exists_LDADD = $(VPNOR_LDADD)
 
 vpnor_test_write_patch_SOURCES = \
-	$(TEST_MBOX_VPNOR_SRCS) \
+	$(TEST_MBOX_VPNOR_INTEG_SRCS) \
 	mtd.c \
-	vpnor/mboxd_pnor_partition_table.cpp \
-	vpnor/mboxd_flash.cpp \
-	vpnor/pnor_partition.cpp \
 	%reldir%/write_patch.cpp
 vpnor_test_write_patch_LDFLAGS = $(OESDK_TESTCASE_FLAGS)
 vpnor_test_write_patch_LDADD = $(VPNOR_LDADD)
 
 vpnor_test_write_prsv_SOURCES = \
-	$(TEST_MBOX_VPNOR_SRCS) \
+	$(TEST_MBOX_VPNOR_INTEG_SRCS) \
 	mtd.c \
-	vpnor/mboxd_pnor_partition_table.cpp \
-	vpnor/mboxd_flash.cpp \
-	vpnor/pnor_partition.cpp \
 	%reldir%/write_prsv.cpp
 vpnor_test_write_prsv_LDFLAGS = $(OESDK_TESTCASE_FLAGS)
 vpnor_test_write_prsv_LDADD = $(VPNOR_LDADD)
 
 vpnor_test_write_ro_SOURCES = \
-	$(TEST_MBOX_VPNOR_SRCS) \
+	$(TEST_MBOX_VPNOR_INTEG_SRCS) \
 	mtd.c \
-	vpnor/mboxd_pnor_partition_table.cpp \
-	vpnor/mboxd_flash.cpp \
-	vpnor/pnor_partition.cpp \
 	%reldir%/write_ro.cpp
 vpnor_test_write_ro_LDFLAGS = $(OESDK_TESTCASE_FLAGS)
 vpnor_test_write_ro_LDADD = $(VPNOR_LDADD)
 
 vpnor_test_write_rw_SOURCES = \
-	$(TEST_MBOX_VPNOR_SRCS) \
+	$(TEST_MBOX_VPNOR_INTEG_SRCS) \
 	mtd.c \
-	vpnor/mboxd_pnor_partition_table.cpp \
-	vpnor/mboxd_flash.cpp \
-	vpnor/pnor_partition.cpp \
 	%reldir%/write_rw.cpp
 vpnor_test_write_rw_LDFLAGS = $(OESDK_TESTCASE_FLAGS)
 vpnor_test_write_rw_LDADD = $(VPNOR_LDADD)
@@ -180,11 +169,8 @@
 vpnor_test_read_patch_LDADD = $(VPNOR_LDADD)
 
 vpnor_test_write_patch_resize_SOURCES = \
-	$(TEST_MBOX_VPNOR_SRCS) \
+	$(TEST_MBOX_VPNOR_INTEG_SRCS) \
 	mtd.c \
-	vpnor/mboxd_pnor_partition_table.cpp \
-	vpnor/mboxd_flash.cpp \
-	vpnor/pnor_partition.cpp \
 	%reldir%/write_patch_resize.cpp
 vpnor_test_write_patch_resize_LDFLAGS = $(OESDK_TESTCASE_FLAGS)
 vpnor_test_write_patch_resize_LDADD = $(VPNOR_LDADD)