diff --git a/lib/base/timer.cpp b/lib/base/timer.cpp
index 5ff21439f..4d0938fc0 100644
--- a/lib/base/timer.cpp
+++ b/lib/base/timer.cpp
@@ -252,7 +252,7 @@ void Timer::AdjustTimers(double adjustment)
 			timer->m_Next += adjustment;
 			l_Timers.erase(timer);
 			l_Timers.insert(timer);
-		    }
+		}
 	}
 
 	/* Notify the worker that we've rescheduled some timers. */
diff --git a/test/Makefile.am b/test/Makefile.am
index 259c5ba87..6e3a78f0f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -12,9 +12,7 @@ icinga2_test_SOURCES = \
 
 icinga2_test_CPPFLAGS = \
 	$(BOOST_CPPFLAGS) \
-	-I${top_srcdir}/lib/base \
-	-I${top_srcdir}/lib/icinga \
-	-I${top_srcdir}
+	-I${top_srcdir}/lib
 
 icinga2_test_LDADD = \
 	$(BOOST_LDFLAGS) \
diff --git a/test/base-dictionary.cpp b/test/base-dictionary.cpp
index 486e70429..3196b4dfb 100644
--- a/test/base-dictionary.cpp
+++ b/test/base-dictionary.cpp
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
+#include "base/dictionary.h"
 #include <boost/test/unit_test.hpp>
-
-#include <i2-base.h>
+#include <boost/smart_ptr/make_shared.hpp>
 
 using namespace icinga;