diff --git a/Makefile.am b/Makefile.am
index 6f2e0bc9..d09f8072 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,9 +22,9 @@ profanity_SOURCES = src/contact.c src/contact.h src/log.c src/common.c \
 TESTS = tests/testsuite
 check_PROGRAMS = tests/testsuite
 tests_testsuite_SOURCES = tests/test_contact_list.c src/contact_list.c src/contact.c \
-	tests/test_common.c tests/test_history.c src/history.c src/common.c \
-	tests/test_autocomplete.c src/autocomplete.c tests/testsuite.c \
-	tests/test_parser.c src/command_parser.c tests/test_jid.c src/jid.c
+	tests/test_common.c tests/test_history.c src/tools/history.c src/common.c \
+	tests/test_autocomplete.c src/tools/autocomplete.c tests/testsuite.c \
+	tests/test_parser.c src/command/parser.c tests/test_jid.c src/jid.c
 tests_testsuite_LDADD = -lheadunit -lstdc++
 
 man_MANS = docs/profanity.1
diff --git a/tests/test_autocomplete.c b/tests/test_autocomplete.c
index ee90e0cb..b7d70e9b 100644
--- a/tests/test_autocomplete.c
+++ b/tests/test_autocomplete.c
@@ -5,7 +5,7 @@
 #include <glib.h>
 
 #include "contact.h"
-#include "autocomplete.h"
+#include "tools/autocomplete.h"
 
 static void clear_empty(void)
 {
diff --git a/tests/test_history.c b/tests/test_history.c
index 75ee8535..91e5aa99 100644
--- a/tests/test_history.c
+++ b/tests/test_history.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <head-unit.h>
-#include "history.h"
+#include "tools/history.h"
 
 void previous_on_empty_returns_null(void)
 {
diff --git a/tests/test_parser.c b/tests/test_parser.c
index d72fd5c0..fd1b1e1c 100644
--- a/tests/test_parser.c
+++ b/tests/test_parser.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <head-unit.h>
-#include "command.h"
+#include "command/parser.h"
 
 void
 parse_null_returns_null(void)