diff --git a/test/ConfigTest.cpp b/test/ConfigTest.cpp
index 13673fca..f3b12974 100644
--- a/test/ConfigTest.cpp
+++ b/test/ConfigTest.cpp
@@ -6,9 +6,9 @@
  * by the Free Software Foundation.
  */
 
-#include "ZNCDebug.h"
-#include "FileUtils.h"
-#include "Config.h"
+#include "znc/ZNCDebug.h"
+#include "znc/FileUtils.h"
+#include "znc/Config.h"
 #include <cstdlib>
 
 class CConfigTest {
@@ -113,7 +113,7 @@ public:
 
 		CConfig::SubConfigMapIterator it2 = conf.BeginSubConfigs();
 		while (it2 != conf.EndSubConfigs()) {
-			map<CString, CConfig::CConfigEntry>::const_iterator it3 = it2->second.begin();
+			map<CString, CConfigEntry>::const_iterator it3 = it2->second.begin();
 
 			while (it3 != it2->second.end()) {
 				sRes += "->" + it2->first + "/" + it3->first + "\n";
diff --git a/test/EscapeTest.cpp b/test/EscapeTest.cpp
index ac46ac57..0ada6c9f 100644
--- a/test/EscapeTest.cpp
+++ b/test/EscapeTest.cpp
@@ -6,8 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include "ZNCString.h"
-#include "ZNCDebug.h"
+#include "znc/ZNCString.h"
+#include "znc/ZNCDebug.h"
 
 static int testEqual(const CString& a, const CString& b, const CString& what)
 {
diff --git a/test/Makefile.in b/test/Makefile.in
index 6e377c60..357f3c83 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -5,14 +5,14 @@ srcdir   := @srcdir@
 VPATH    := @srcdir@
 
 CXX      := @CXX@
-CXXFLAGS := @CPPFLAGS@ @CXXFLAGS@ -I..
+CXXFLAGS := @CPPFLAGS@ @CXXFLAGS@ -I../include
 LDFLAGS  := @LDFLAGS@
 LIBS     := @LIBS@
 
 TARGETS  := ConfigTest EscapeTest
 OBJS     := $(addsuffix .o, $(TARGETS))
 ZNC_OBJS := Config.o ZNCDebug.o FileUtils.o Utils.o ZNCString.o MD5.o SHA256.o
-ZNC_OBJS := $(addprefix ../, $(ZNC_OBJS))
+ZNC_OBJS := $(addprefix ../src/, $(ZNC_OBJS))
 
 ifneq "$(V)" ""
 VERBOSE=1