diff --git a/src/presentation/runningtaskmodel.cpp b/src/presentation/runningtaskmodel.cpp
--- a/src/presentation/runningtaskmodel.cpp
+++ b/src/presentation/runningtaskmodel.cpp
@@ -72,7 +72,7 @@
 
 void RunningTaskModel::stopTask()
 {
-    setRunningTask(nullptr);
+    setRunningTask(Domain::Task::Ptr());
 }
 
 void RunningTaskModel::doneTask()
diff --git a/src/widgets/pageview.cpp b/src/widgets/pageview.cpp
--- a/src/widgets/pageview.cpp
+++ b/src/widgets/pageview.cpp
@@ -451,7 +451,7 @@
     const auto current = m_centralView->selectionModel()->currentIndex();
     const auto data = current.data(Presentation::QueryTreeModelBase::ObjectRole);
     if (!data.isValid())
-        return Domain::Artifact::Ptr(Q_NULLPTR);
+        return Domain::Artifact::Ptr();
 
     return data.value<Domain::Artifact::Ptr>();
 }
diff --git a/tests/features/cuke-steps.cpp b/tests/features/cuke-steps.cpp
--- a/tests/features/cuke-steps.cpp
+++ b/tests/features/cuke-steps.cpp
@@ -82,7 +82,7 @@
 public:
     explicit ZanshinContext(QObject *parent = Q_NULLPTR)
         : QObject(parent),
-          app(Q_NULLPTR),
+          app(),
           presentation(Q_NULLPTR),
           editor(Q_NULLPTR),
           proxyModel(new QSortFilterProxyModel(this)),
diff --git a/tests/units/presentation/runningtaskmodeltest.cpp b/tests/units/presentation/runningtaskmodeltest.cpp
--- a/tests/units/presentation/runningtaskmodeltest.cpp
+++ b/tests/units/presentation/runningtaskmodeltest.cpp
@@ -115,10 +115,10 @@
         model.stopTask();
 
         // THEN
-        QCOMPARE(model.runningTask(), Domain::Task::Ptr(nullptr));
+        QCOMPARE(model.runningTask(), Domain::Task::Ptr());
         QVERIFY(!task->isRunning());
         QCOMPARE(spy.count(), 1);
-        QCOMPARE(spy.at(0).at(0).value<Domain::Task::Ptr>(), Domain::Task::Ptr(nullptr));
+        QCOMPARE(spy.at(0).at(0).value<Domain::Task::Ptr>(), Domain::Task::Ptr());
     }
 
     void shouldHandleDoneTask()
@@ -134,11 +134,11 @@
         model.doneTask();
 
         // THEN
-        QCOMPARE(model.runningTask(), Domain::Task::Ptr(nullptr));
+        QCOMPARE(model.runningTask(), Domain::Task::Ptr());
         QVERIFY(!task->isRunning());
         QVERIFY(task->isDone());
         QCOMPARE(spy.count(), 1);
-        QCOMPARE(spy.at(0).at(0).value<Domain::Task::Ptr>(), Domain::Task::Ptr(nullptr));
+        QCOMPARE(spy.at(0).at(0).value<Domain::Task::Ptr>(), Domain::Task::Ptr());
     }
 
     void shouldHandleSwitchingToAnotherTask()
diff --git a/tests/units/widgets/runningtaskwidgettest.cpp b/tests/units/widgets/runningtaskwidgettest.cpp
--- a/tests/units/widgets/runningtaskwidgettest.cpp
+++ b/tests/units/widgets/runningtaskwidgettest.cpp
@@ -42,7 +42,7 @@
     void stopTask() Q_DECL_OVERRIDE
     {
         Q_ASSERT(m_runningTask);
-        setRunningTask(nullptr);
+        setRunningTask(Domain::Task::Ptr());
     }
 
     void doneTask() Q_DECL_OVERRIDE
@@ -113,7 +113,7 @@
         button->click();
 
         // THEN stopTask should have been called
-        QCOMPARE(model.runningTask(), Domain::Task::Ptr(nullptr));
+        QCOMPARE(model.runningTask(), Domain::Task::Ptr());
         QVERIFY(widget.isHidden());
     }