2 files changed, 12 insertions, 16 deletions
diff --git a/searchlib/src/tests/common/foregroundtaskexecutor/foregroundtaskexecutor_test.cpp b/searchlib/src/tests/common/foregroundtaskexecutor/foregroundtaskexecutor_test.cpp
index a7b0e90ea1f..0cbd4bd9473 100644
--- a/searchlib/src/tests/common/foregroundtaskexecutor/foregroundtaskexecutor_test.cpp
+++ b/searchlib/src/tests/common/foregroundtaskexecutor/foregroundtaskexecutor_test.cpp
@@ -1,17 +1,16 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/log/log.h>
-LOG_SETUP("foregroundtaskexecutor_test");
+
 #include <vespa/searchlib/common/foregroundtaskexecutor.h>
 #include <vespa/vespalib/testkit/testapp.h>
 
 #include <mutex>
 #include <condition_variable>
+#include <unistd.h>
 
-namespace search
-{
+#include <vespa/log/log.h>
+LOG_SETUP("foregroundtaskexecutor_test");
 
-namespace common
-{
+namespace search::common {
 
 
 class Fixture
@@ -117,7 +116,6 @@ TEST_F("require that task with different ids are serialized", Fixture)
 }
 
 
-}  // namespace common
-}  // namespace search
+}
 
 TEST_MAIN() { TEST_RUN_ALL(); }
diff --git a/searchlib/src/tests/common/sequencedtaskexecutor/sequencedtaskexecutor_test.cpp b/searchlib/src/tests/common/sequencedtaskexecutor/sequencedtaskexecutor_test.cpp
index 569bff0f6f3..7d158918715 100644
--- a/searchlib/src/tests/common/sequencedtaskexecutor/sequencedtaskexecutor_test.cpp
+++ b/searchlib/src/tests/common/sequencedtaskexecutor/sequencedtaskexecutor_test.cpp
@@ -1,18 +1,17 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/log/log.h>
-LOG_SETUP("sequencedtaskexecutor_test");
+
 #include <vespa/searchlib/common/sequencedtaskexecutor.h>
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/test/insertion_operators.h>
 
 #include <mutex>
 #include <condition_variable>
+#include <unistd.h>
 
-namespace search
-{
+#include <vespa/log/log.h>
+LOG_SETUP("sequencedtaskexecutor_test");
 
-namespace common
-{
+namespace search::common {
 
 
 class Fixture
@@ -236,7 +235,6 @@ TEST_F("require that executeLambda works", Fixture)
 }
 
 
-}  // namespace common
-}  // namespace search
+}
 
 TEST_MAIN() { TEST_RUN_ALL(); }