diff --git a/src/entity_manager/entity_manager.cpp b/src/entity_manager/entity_manager.cpp
index d55105c..b191bf0 100644
--- a/src/entity_manager/entity_manager.cpp
+++ b/src/entity_manager/entity_manager.cpp
@@ -677,25 +677,3 @@
             }
         });
 }
-
-int main()
-{
-    boost::asio::io_context io;
-    auto systemBus = std::make_shared<sdbusplus::asio::connection>(io);
-    systemBus->request_name("xyz.openbmc_project.EntityManager");
-    EntityManager em(systemBus, io);
-
-    nlohmann::json systemConfiguration = nlohmann::json::object();
-
-    boost::asio::post(io, [&]() { em.propertiesChangedCallback(); });
-
-    em.handleCurrentConfigurationJson();
-
-    // some boards only show up after power is on, we want to not say they are
-    // removed until the same state happens
-    em.powerStatus.setupPowerMatch(em.systemBus);
-
-    io.run();
-
-    return 0;
-}
diff --git a/src/entity_manager/main.cpp b/src/entity_manager/main.cpp
new file mode 100644
index 0000000..efcb4d0
--- /dev/null
+++ b/src/entity_manager/main.cpp
@@ -0,0 +1,44 @@
+/*
+// Copyright (c) 2018 Intel Corporation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+*/
+
+#include "entity_manager.hpp"
+
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/post.hpp>
+#include <nlohmann/json.hpp>
+#include <sdbusplus/asio/connection.hpp>
+
+int main()
+{
+    boost::asio::io_context io;
+    auto systemBus = std::make_shared<sdbusplus::asio::connection>(io);
+    systemBus->request_name("xyz.openbmc_project.EntityManager");
+    EntityManager em(systemBus, io);
+
+    nlohmann::json systemConfiguration = nlohmann::json::object();
+
+    boost::asio::post(io, [&]() { em.propertiesChangedCallback(); });
+
+    em.handleCurrentConfigurationJson();
+
+    // some boards only show up after power is on, we want to not say they are
+    // removed until the same state happens
+    em.powerStatus.setupPowerMatch(em.systemBus);
+
+    io.run();
+
+    return 0;
+}
diff --git a/src/entity_manager/meson.build b/src/entity_manager/meson.build
index 200c9f9..c55a6a8 100644
--- a/src/entity_manager/meson.build
+++ b/src/entity_manager/meson.build
@@ -19,6 +19,7 @@
     'topology.cpp',
     'utils.cpp',
     '../utils.cpp',
+    'main.cpp',
     cpp_args: cpp_args_em,
     dependencies: [
         boost,