diff --git a/src/core/context/contextsimulator.cpp b/src/core/context/contextsimulator.cpp
index b3337ef8a..c8945521a 100644
--- a/src/core/context/contextsimulator.cpp
+++ b/src/core/context/contextsimulator.cpp
@@ -49,11 +49,6 @@ namespace swift::core::context
         }
     }
 
-    ISimulator::SimulatorStatus IContextSimulator::getSimulatorStatusEnum() const
-    {
-        return static_cast<ISimulator::SimulatorStatus>(this->getSimulatorStatus());
-    }
-
     CSimulatorInfo IContextSimulator::getSimulatorInfo() const
     {
         return this->getSimulatorPluginInfo().getSimulatorInfo();
@@ -66,7 +61,7 @@ namespace swift::core::context
 
     bool IContextSimulator::isSimulatorSimulating() const
     {
-        if (!isSimulatorAvailable() || !getSimulatorStatusEnum().testFlag(ISimulator::Simulating)) { return false; }
+        if (!isSimulatorAvailable() || !getSimulatorStatus().testFlag(ISimulator::Simulating)) { return false; }
         return true;
     }
 } // namespace swift::core::context
diff --git a/src/core/context/contextsimulator.h b/src/core/context/contextsimulator.h
index be2f8ba08..b0aaada15 100644
--- a/src/core/context/contextsimulator.h
+++ b/src/core/context/contextsimulator.h
@@ -74,10 +74,6 @@ namespace swift::core::context
         //! Destructor
         ~IContextSimulator() override {}
 
-        //! Get simulator status as enum
-        //! \fixme To be removed with Qt 5.5 when getSimualtorStatus directly provides the enum
-        ISimulator::SimulatorStatus getSimulatorStatusEnum() const;
-
         // ---- some convenienc functions implemented on interface level
 
         //! Current simulator
@@ -169,7 +165,7 @@ namespace swift::core::context
         virtual void stopSimulatorPlugin(const swift::misc::simulation::CSimulatorPluginInfo &simulatorInfo) = 0;
 
         //! Simulator combined status
-        virtual int getSimulatorStatus() const = 0;
+        virtual ISimulator::SimulatorStatus getSimulatorStatus() const = 0;
 
         //! Simulator setup
         virtual swift::misc::simulation::CSimulatorInternals getSimulatorInternals() const = 0;
diff --git a/src/core/context/contextsimulatorempty.h b/src/core/context/contextsimulatorempty.h
index aea10723b..da733cb80 100644
--- a/src/core/context/contextsimulatorempty.h
+++ b/src/core/context/contextsimulatorempty.h
@@ -67,10 +67,10 @@ namespace swift::core::context
         virtual int checkListeners() override { return 0; }
 
         //! \copydoc IContextSimulator::getSimulatorStatus
-        virtual int getSimulatorStatus() const override
+        virtual ISimulator::SimulatorStatus getSimulatorStatus() const override
         {
             logEmptyContextWarning(Q_FUNC_INFO);
-            return 0;
+            return ISimulator::Unspecified;
         }
 
         //! \copydoc IContextSimulator::stopSimulatorPlugin
diff --git a/src/core/context/contextsimulatorimpl.cpp b/src/core/context/contextsimulatorimpl.cpp
index 045beeb2b..ea1050b73 100644
--- a/src/core/context/contextsimulatorimpl.cpp
+++ b/src/core/context/contextsimulatorimpl.cpp
@@ -188,10 +188,10 @@ namespace swift::core::context
         return m_plugins->checkAvailableListeners();
     }
 
-    int CContextSimulator::getSimulatorStatus() const
+    ISimulator::SimulatorStatus CContextSimulator::getSimulatorStatus() const
     {
         if (isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; }
-        if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return 0; }
+        if (!m_simulatorPlugin.second || m_simulatorPlugin.first.isUnspecified()) { return ISimulator::Unspecified; }
         return m_simulatorPlugin.second->getSimulatorStatus();
     }
 
diff --git a/src/core/context/contextsimulatorimpl.h b/src/core/context/contextsimulatorimpl.h
index b97ba703f..16f3083e6 100644
--- a/src/core/context/contextsimulatorimpl.h
+++ b/src/core/context/contextsimulatorimpl.h
@@ -98,7 +98,7 @@ namespace swift::core
             virtual int checkListeners() override;
 
             //! \copydoc swift::core::context::IContextSimulator::getSimulatorStatus
-            virtual int getSimulatorStatus() const override;
+            virtual ISimulator::SimulatorStatus getSimulatorStatus() const override;
 
             //! \copydoc swift::core::context::IContextSimulator::getSimulatorInternals
             virtual swift::misc::simulation::CSimulatorInternals getSimulatorInternals() const override;
diff --git a/src/core/context/contextsimulatorproxy.cpp b/src/core/context/contextsimulatorproxy.cpp
index 6009bf027..f88b2ed2c 100644
--- a/src/core/context/contextsimulatorproxy.cpp
+++ b/src/core/context/contextsimulatorproxy.cpp
@@ -131,9 +131,9 @@ namespace swift::core::context
         return m_dBusInterface->callDBusRet<bool>(QLatin1String("setSimulatorSettings"), settings, simulatorInfo);
     }
 
-    int CContextSimulatorProxy::getSimulatorStatus() const
+    ISimulator::SimulatorStatus CContextSimulatorProxy::getSimulatorStatus() const
     {
-        return m_dBusInterface->callDBusRet<int>(QLatin1String("getSimulatorStatus"));
+        return m_dBusInterface->callDBusRet<ISimulator::SimulatorStatus>(QLatin1String("getSimulatorStatus"));
     }
 
     CAirportList CContextSimulatorProxy::getAirportsInRange(bool recalculatePosition) const
diff --git a/src/core/context/contextsimulatorproxy.h b/src/core/context/contextsimulatorproxy.h
index 9c63415a3..c28cc97b4 100644
--- a/src/core/context/contextsimulatorproxy.h
+++ b/src/core/context/contextsimulatorproxy.h
@@ -81,7 +81,7 @@ namespace swift::core
             virtual int checkListeners() override;
 
             //! \copydoc swift::core::context::IContextSimulator::getSimulatorStatus
-            virtual int getSimulatorStatus() const override;
+            virtual ISimulator::SimulatorStatus getSimulatorStatus() const override;
 
             //! \copydoc swift::core::context::IContextSimulator::getAirportsInRange
             virtual swift::misc::aviation::CAirportList getAirportsInRange(bool recalculatePosition) const override;