diff --git a/src/aktualizr_info/aktualizr_info_test.cc b/src/aktualizr_info/aktualizr_info_test.cc
index 6b15c0547..6f4c3753e 100644
--- a/src/aktualizr_info/aktualizr_info_test.cc
+++ b/src/aktualizr_info/aktualizr_info_test.cc
@@ -1,6 +1,7 @@
 #include <gtest/gtest.h>
 
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
 
 #include "libaktualizr/config.h"
 #include "storage/sqlstorage.h"
diff --git a/src/aktualizr_secondary/aktualizr_secondary_test.cc b/src/aktualizr_secondary/aktualizr_secondary_test.cc
index 7094e019f..98705261d 100644
--- a/src/aktualizr_secondary/aktualizr_secondary_test.cc
+++ b/src/aktualizr_secondary/aktualizr_secondary_test.cc
@@ -2,7 +2,9 @@
 #include <gtest/gtest.h>
 
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/string_file.hpp>
 #include <boost/optional/optional_io.hpp>
+#include <fstream>
 
 #include "aktualizr_secondary_file.h"
 #include "crypto/keymanager.h"
diff --git a/src/cert_provider/cert_provider_test.cc b/src/cert_provider/cert_provider_test.cc
index 913ccecab..b1c4336be 100644
--- a/src/cert_provider/cert_provider_test.cc
+++ b/src/cert_provider/cert_provider_test.cc
@@ -1,6 +1,7 @@
 #include <gtest/gtest.h>
 
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
 #include <boost/format.hpp>
 
 #include "cert_provider_test.h"
diff --git a/src/libaktualizr/config/config_test.cc b/src/libaktualizr/config/config_test.cc
index 0c1ae8e02..79a8e6e51 100644
--- a/src/libaktualizr/config/config_test.cc
+++ b/src/libaktualizr/config/config_test.cc
@@ -6,6 +6,7 @@
 #include <boost/algorithm/hex.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
+#include <fstream>
 
 #include "bootstrap/bootstrap.h"
 #include "crypto/crypto.h"
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ffcf09610..4e99310f0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -197,6 +197,9 @@ add_test(NAME test_ip_secondary
          COMMAND ${PROJECT_SOURCE_DIR}/tests/ipsecondary_test.py
          --build-dir ${PROJECT_BINARY_DIR} --src-dir ${PROJECT_SOURCE_DIR})
 set_tests_properties(test_ip_secondary PROPERTIES LABELS "noptest")
+# This test flakes when run in parallel. Force it to run serially
+# TODO Fix this test!
+set_tests_properties(test_ip_secondary PROPERTIES RUN_SERIAL ON)
 
 add_test(NAME test_ip_secondary_rotation
          COMMAND ${PROJECT_SOURCE_DIR}/tests/ipsecondary_rotation_test.py