diff --git a/test/lib/emitter/common/types.h b/test/lib/emitter/common/types.h
deleted file mode 100644
index 889196da4..000000000
--- a/test/lib/emitter/common/types.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef ENTT_LIB_EMITTER_COMMON_TYPES_H
-#define ENTT_LIB_EMITTER_COMMON_TYPES_H
-
-#include <entt/signal/emitter.hpp>
-
-struct test_emitter
-    : entt::emitter<test_emitter> {};
-
-struct message {
-    int payload{};
-};
-
-struct event {};
-
-#endif
diff --git a/test/lib/emitter/plugin/main.cpp b/test/lib/emitter/plugin/main.cpp
index f9121c47b..ec90d101a 100644
--- a/test/lib/emitter/plugin/main.cpp
+++ b/test/lib/emitter/plugin/main.cpp
@@ -1,18 +1,19 @@
 #define CR_HOST
 
 #include <gtest/gtest.h>
+#include <common/boxed_type.h>
+#include <common/emitter.h>
 #include <cr.h>
-#include "../common/types.h"
 
 TEST(Lib, Emitter) {
-    test_emitter emitter;
+    test::emitter emitter;
     int value{};
 
     ASSERT_EQ(value, 0);
 
-    emitter.on<message>([&](message msg, test_emitter &owner) {
-        value = msg.payload;
-        owner.erase<message>();
+    emitter.on<test::boxed_int>([&](test::boxed_int msg, test::emitter &owner) {
+        value = msg.value;
+        owner.erase<test::boxed_int>();
     });
 
     cr_plugin ctx;
diff --git a/test/lib/emitter/plugin/plugin.cpp b/test/lib/emitter/plugin/plugin.cpp
index 2db74d6d9..0a2c15c48 100644
--- a/test/lib/emitter/plugin/plugin.cpp
+++ b/test/lib/emitter/plugin/plugin.cpp
@@ -1,12 +1,14 @@
+#include <common/boxed_type.h>
+#include <common/emitter.h>
+#include <common/empty.h>
 #include <cr.h>
-#include "../common/types.h"
 
 CR_EXPORT int cr_main(cr_plugin *ctx, cr_op operation) {
     switch(operation) {
     case CR_STEP:
-        static_cast<test_emitter *>(ctx->userdata)->publish(event{});
-        static_cast<test_emitter *>(ctx->userdata)->publish(message{4});
-        static_cast<test_emitter *>(ctx->userdata)->publish(message{3});
+        static_cast<test::emitter *>(ctx->userdata)->publish(test::empty{});
+        static_cast<test::emitter *>(ctx->userdata)->publish(test::boxed_int{4});
+        static_cast<test::emitter *>(ctx->userdata)->publish(test::boxed_int{3});
         break;
     case CR_CLOSE:
     case CR_LOAD:
diff --git a/test/lib/emitter/shared/lib.cpp b/test/lib/emitter/shared/lib.cpp
index 6dc07e14d..be29dc054 100644
--- a/test/lib/emitter/shared/lib.cpp
+++ b/test/lib/emitter/shared/lib.cpp
@@ -1,8 +1,10 @@
+#include <common/boxed_type.h>
+#include <common/emitter.h>
+#include <common/empty.h>
 #include <entt/core/attribute.h>
-#include "../common/types.h"
 
-ENTT_API void emit(test_emitter &emitter) {
-    emitter.publish(event{});
-    emitter.publish(message{2});
-    emitter.publish(message{3});
+ENTT_API void emit(test::emitter &emitter) {
+    emitter.publish(test::empty{});
+    emitter.publish(test::boxed_int{2});
+    emitter.publish(test::boxed_int{3});
 }
diff --git a/test/lib/emitter/shared/main.cpp b/test/lib/emitter/shared/main.cpp
index 11e76733b..37642d47b 100644
--- a/test/lib/emitter/shared/main.cpp
+++ b/test/lib/emitter/shared/main.cpp
@@ -1,18 +1,19 @@
 #include <gtest/gtest.h>
+#include <common/boxed_type.h>
+#include <common/emitter.h>
 #include <entt/core/attribute.h>
-#include "../common/types.h"
 
-ENTT_API void emit(test_emitter &);
+ENTT_API void emit(test::emitter &);
 
 TEST(Lib, Emitter) {
-    test_emitter emitter;
+    test::emitter emitter;
     int value{};
 
     ASSERT_EQ(value, 0);
 
-    emitter.on<message>([&](message msg, test_emitter &owner) {
-        value = msg.payload;
-        owner.erase<message>();
+    emitter.on<test::boxed_int>([&](test::boxed_int msg, test::emitter &owner) {
+        value = msg.value;
+        owner.erase<test::boxed_int>();
     });
 
     emit(emitter);