diff --git a/src/tests/ply-boot-client-test.am b/src/tests/ply-boot-client-test.am
new file mode 100644
index 00000000..f733032f
--- /dev/null
+++ b/src/tests/ply-boot-client-test.am
@@ -0,0 +1,16 @@
+TESTS += ply-boot-client-test
+
+ply_boot_client_test_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLY_BOOT_CLIENT_ENABLE_TEST
+ply_boot_client_test_LDADD = $(PLYMOUTH_LIBS)
+
+ply_boot_client_test_SOURCES =                                                \
+                          $(srcdir)/../ply-utils.h                            \
+                          $(srcdir)/../ply-utils.c                            \
+                          $(srcdir)/../ply-logger.h                           \
+                          $(srcdir)/../ply-logger.c                           \
+                          $(srcdir)/../ply-list.h                             \
+                          $(srcdir)/../ply-list.c                             \
+                          $(srcdir)/../ply-event-loop.h                       \
+                          $(srcdir)/../ply-event-loop.c                       \
+                          $(srcdir)/../ply-boot-client.h                      \
+                          $(srcdir)/../ply-boot-client.c
diff --git a/src/tests/ply-boot-server-test.am b/src/tests/ply-boot-server-test.am
new file mode 100644
index 00000000..1cbdf423
--- /dev/null
+++ b/src/tests/ply-boot-server-test.am
@@ -0,0 +1,16 @@
+TESTS += ply-boot-server-test
+
+ply_boot_server_test_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLY_BOOT_SERVER_ENABLE_TEST
+ply_boot_server_test_LDADD = $(PLYMOUTH_LIBS)
+
+ply_boot_server_test_SOURCES =                                                \
+                          $(srcdir)/../ply-utils.h                            \
+                          $(srcdir)/../ply-utils.c                            \
+                          $(srcdir)/../ply-logger.h                           \
+                          $(srcdir)/../ply-logger.c                           \
+                          $(srcdir)/../ply-list.h                             \
+                          $(srcdir)/../ply-list.c                             \
+                          $(srcdir)/../ply-event-loop.h                       \
+                          $(srcdir)/../ply-event-loop.c                       \
+                          $(srcdir)/../ply-boot-server.h                      \
+                          $(srcdir)/../ply-boot-server.c