diff --git a/Makefile.am b/Makefile.am
index deff7ffe..6c1d88c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,7 +74,6 @@ core_sources = \
 
 unittest_sources = \
 	src/xmpp/contact.c src/xmpp/contact.h src/common.c \
-	src/chatlog.c src/chatlog.h \
 	src/log.h src/profanity.c src/common.h \
 	src/profanity.h src/xmpp/chat_session.c \
 	src/xmpp/chat_session.h src/xmpp/muc.c src/xmpp/muc.h src/xmpp/jid.h src/xmpp/jid.c \
@@ -125,6 +124,7 @@ unittest_sources = \
 	tests/unittests/xmpp/stub_message.c \
 	tests/unittests/ui/stub_ui.c tests/unittests/ui/stub_ui.h \
 	tests/unittests/log/stub_log.c \
+	tests/unittests/chatlog/stub_chatlog.c \
 	tests/unittests/database/stub_database.c \
 	tests/unittests/config/stub_accounts.c \
 	tests/unittests/config/stub_cafile.c \
diff --git a/tests/unittests/chatlog/stub_chatlog.c b/tests/unittests/chatlog/stub_chatlog.c
new file mode 100644
index 00000000..33251f57
--- /dev/null
+++ b/tests/unittests/chatlog/stub_chatlog.c
@@ -0,0 +1,92 @@
+/*
+ * mock_log.c
+ *
+ * Copyright (C) 2012 - 2019 James Booth <boothj5@gmail.com>
+ *
+ * This file is part of Profanity.
+ *
+ * Profanity is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Profanity is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <glib.h>
+#include <setjmp.h>
+#include <cmocka.h>
+
+#include <xmpp/xmpp.h>
+
+void
+chat_log_init(void)
+{
+}
+
+void
+chat_log_msg_out(const char* const barejid, const char* const msg, const char* const resource)
+{
+}
+void
+chat_log_otr_msg_out(const char* const barejid, const char* const msg, const char* const resource)
+{
+}
+void
+chat_log_pgp_msg_out(const char* const barejid, const char* const msg, const char* const resource)
+{
+}
+void
+chat_log_omemo_msg_out(const char* const barejid, const char* const msg, const char* const resource)
+{
+}
+
+void
+chat_log_msg_in(ProfMessage* message)
+{
+}
+void
+chat_log_otr_msg_in(ProfMessage* message)
+{
+}
+void
+chat_log_pgp_msg_in(ProfMessage* message)
+{
+}
+void
+chat_log_omemo_msg_in(ProfMessage* message)
+{
+}
+
+void
+chat_log_close(void)
+{
+}
+
+void
+groupchat_log_init(void)
+{
+}
+void
+groupchat_log_msg_in(const gchar* const room, const gchar* const nick, const gchar* const msg)
+{
+}
+void
+groupchat_log_msg_out(const gchar* const room, const gchar* const msg)
+{
+}
+void
+groupchat_log_omemo_msg_in(const gchar* const room, const gchar* const nick, const gchar* const msg)
+{
+}
+void
+groupchat_log_omemo_msg_out(const gchar* const room, const gchar* const msg)
+{
+}
diff --git a/tests/unittests/config/stub_cafile.c b/tests/unittests/config/stub_cafile.c
index ea31de11..032cdaf3 100644
--- a/tests/unittests/config/stub_cafile.c
+++ b/tests/unittests/config/stub_cafile.c
@@ -41,6 +41,7 @@
 
 #include "common.h"
 #include "config/files.h"
+#include "xmpp/xmpp.h"
 #include "log.h"
 
 void
diff --git a/tests/unittests/log/stub_log.c b/tests/unittests/log/stub_log.c
index 4770eef0..dfa2619a 100644
--- a/tests/unittests/log/stub_log.c
+++ b/tests/unittests/log/stub_log.c
@@ -85,68 +85,3 @@ void
 log_stderr_handler(void)
 {
 }
-
-void
-chat_log_init(void)
-{
-}
-
-void
-chat_log_msg_out(const char* const barejid, const char* const msg, const char* const resource)
-{
-}
-void
-chat_log_otr_msg_out(const char* const barejid, const char* const msg, const char* const resource)
-{
-}
-void
-chat_log_pgp_msg_out(const char* const barejid, const char* const msg, const char* const resource)
-{
-}
-void
-chat_log_omemo_msg_out(const char* const barejid, const char* const msg, const char* const resource)
-{
-}
-
-void
-chat_log_msg_in(ProfMessage* message)
-{
-}
-void
-chat_log_otr_msg_in(ProfMessage* message)
-{
-}
-void
-chat_log_pgp_msg_in(ProfMessage* message)
-{
-}
-void
-chat_log_omemo_msg_in(ProfMessage* message)
-{
-}
-
-void
-chat_log_close(void)
-{
-}
-
-void
-groupchat_log_init(void)
-{
-}
-void
-groupchat_log_msg_in(const gchar* const room, const gchar* const nick, const gchar* const msg)
-{
-}
-void
-groupchat_log_msg_out(const gchar* const room, const gchar* const msg)
-{
-}
-void
-groupchat_log_omemo_msg_in(const gchar* const room, const gchar* const nick, const gchar* const msg)
-{
-}
-void
-groupchat_log_omemo_msg_out(const gchar* const room, const gchar* const msg)
-{
-}