diff --git a/autotests/client/test_wayland_appmenu.cpp b/autotests/client/test_wayland_appmenu.cpp
index 7577a94..8ba19fa 100644
--- a/autotests/client/test_wayland_appmenu.cpp
+++ b/autotests/client/test_wayland_appmenu.cpp
@@ -1,196 +1,196 @@
 /********************************************************************
 Copyright 2017  David Edmundson <davidedmundson@kde.org>
 Copyright 2014  Martin Gräßlin <mgraesslin@kde.org>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
 License as published by the Free Software Foundation; either
 version 2.1 of the License, or (at your option) version 3, or any
 later version accepted by the membership of KDE e.V. (or its
 successor approved by the membership of KDE e.V.), which shall
 act as a proxy defined in Section 6 of version 3 of the license.
 
 This library is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 // Qt
 #include <QtTest/QtTest>
 // KWin
 #include "../../src/client/compositor.h"
 #include "../../src/client/connection_thread.h"
 #include "../../src/client/event_queue.h"
 #include "../../src/client/region.h"
 #include "../../src/client/registry.h"
 #include "../../src/client/surface.h"
 #include "../../src/client/appmenu.h"
 #include "../../src/server/display.h"
 #include "../../src/server/compositor_interface.h"
 #include "../../src/server/region_interface.h"
 #include "../../src/server/appmenu_interface.h"
 
 using namespace KWayland::Client;
 
 Q_DECLARE_METATYPE(KWayland::Server::AppMenuInterface::InterfaceAddress)
 
 class TestAppmenu : public QObject
 {
     Q_OBJECT
 public:
     explicit TestAppmenu(QObject *parent = nullptr);
 private Q_SLOTS:
     void init();
     void cleanup();
 
     void testCreateAndSet();
 
 private:
     KWayland::Server::Display *m_display;
     KWayland::Server::CompositorInterface *m_compositorInterface;
     KWayland::Server::AppMenuManagerInterface *m_appmenuManagerInterface;
     KWayland::Client::ConnectionThread *m_connection;
     KWayland::Client::Compositor *m_compositor;
     KWayland::Client::AppMenuManager *m_appmenuManager;
     KWayland::Client::EventQueue *m_queue;
     QThread *m_thread;
 };
 
 static const QString s_socketName = QStringLiteral("kwayland-test-wayland-appmenu-0");
 
 TestAppmenu::TestAppmenu(QObject *parent)
     : QObject(parent)
     , m_display(nullptr)
     , m_compositorInterface(nullptr)
     , m_connection(nullptr)
     , m_compositor(nullptr)
     , m_queue(nullptr)
     , m_thread(nullptr)
 {
 }
 
 void TestAppmenu::init()
 {
     using namespace KWayland::Server;
     qRegisterMetaType<AppMenuInterface::InterfaceAddress>();
     delete m_display;
     m_display = new Display(this);
     m_display->setSocketName(s_socketName);
     m_display->start();
     QVERIFY(m_display->isRunning());
 
     // setup connection
     m_connection = new KWayland::Client::ConnectionThread;
     QSignalSpy connectedSpy(m_connection, &ConnectionThread::connected);
     QVERIFY(connectedSpy.isValid());
     m_connection->setSocketName(s_socketName);
 
     m_thread = new QThread(this);
     m_connection->moveToThread(m_thread);
     m_thread->start();
 
     m_connection->initConnection();
     QVERIFY(connectedSpy.wait());
 
     m_queue = new KWayland::Client::EventQueue(this);
     QVERIFY(!m_queue->isValid());
     m_queue->setup(m_connection);
     QVERIFY(m_queue->isValid());
 
     Registry registry;
     QSignalSpy compositorSpy(&registry, &Registry::compositorAnnounced);
     QVERIFY(compositorSpy.isValid());
 
     QSignalSpy appmenuSpy(&registry, &Registry::appMenuAnnounced);
     QVERIFY(appmenuSpy.isValid());
 
     QVERIFY(!registry.eventQueue());
     registry.setEventQueue(m_queue);
     QCOMPARE(registry.eventQueue(), m_queue);
     registry.create(m_connection->display());
     QVERIFY(registry.isValid());
     registry.setup();
 
     m_compositorInterface = m_display->createCompositor(m_display);
     m_compositorInterface->create();
     QVERIFY(m_compositorInterface->isValid());
 
     QVERIFY(compositorSpy.wait());
     m_compositor = registry.createCompositor(compositorSpy.first().first().value<quint32>(), compositorSpy.first().last().value<quint32>(), this);
 
     m_appmenuManagerInterface = m_display->createAppMenuManagerInterface(m_display);
     m_appmenuManagerInterface->create();
     QVERIFY(m_appmenuManagerInterface->isValid());
 
     QVERIFY(appmenuSpy.wait());
     m_appmenuManager = registry.createAppMenuManager(appmenuSpy.first().first().value<quint32>(), appmenuSpy.first().last().value<quint32>(), this);
 }
 
 void TestAppmenu::cleanup()
 {
 #define CLEANUP(variable) \
     if (variable) { \
         delete variable; \
         variable = nullptr; \
     }
     CLEANUP(m_compositor)
     CLEANUP(m_appmenuManager)
     CLEANUP(m_queue)
     if (m_connection) {
         m_connection->deleteLater();
         m_connection = nullptr;
     }
     if (m_thread) {
         m_thread->quit();
         m_thread->wait();
         delete m_thread;
         m_thread = nullptr;
     }
     CLEANUP(m_compositorInterface)
     CLEANUP(m_appmenuManagerInterface)
     CLEANUP(m_display)
 #undef CLEANUP
 }
 
 void TestAppmenu::testCreateAndSet()
 {
     QSignalSpy serverSurfaceCreated(m_compositorInterface, SIGNAL(surfaceCreated(KWayland::Server::SurfaceInterface*)));
     QVERIFY(serverSurfaceCreated.isValid());
 
     QScopedPointer<KWayland::Client::Surface> surface(m_compositor->createSurface());
     QVERIFY(serverSurfaceCreated.wait());
 
     auto serverSurface = serverSurfaceCreated.first().first().value<KWayland::Server::SurfaceInterface*>();
     QSignalSpy appMenuCreated(m_appmenuManagerInterface, &KWayland::Server::AppMenuManagerInterface::appMenuCreated);
 
-    QCOMPARE(m_appmenuManagerInterface->appMenuForSurface(serverSurface), nullptr);
+    QVERIFY(!m_appmenuManagerInterface->appMenuForSurface(serverSurface));
 
     auto appmenu = m_appmenuManager->create(surface.data(), surface.data());
     QVERIFY(appMenuCreated.wait());
     auto appMenuInterface = appMenuCreated.first().first().value<KWayland::Server::AppMenuInterface*>();
     QCOMPARE(m_appmenuManagerInterface->appMenuForSurface(serverSurface), appMenuInterface);
 
     QCOMPARE(appMenuInterface->address().serviceName, QString());
     QCOMPARE(appMenuInterface->address().objectPath, QString());
 
     QSignalSpy appMenuChangedSpy(appMenuInterface, &KWayland::Server::AppMenuInterface::addressChanged);
 
     appmenu->setAddress("net.somename", "/test/path");
 
     QVERIFY(appMenuChangedSpy.wait());
     QCOMPARE(appMenuInterface->address().serviceName, QString("net.somename"));
     QCOMPARE(appMenuInterface->address().objectPath, QString("/test/path"));
 
     // and destroy
     QSignalSpy destroyedSpy(appMenuInterface, &QObject::destroyed);
     QVERIFY(destroyedSpy.isValid());
     delete appmenu;
     QVERIFY(destroyedSpy.wait());
-    QCOMPARE(m_appmenuManagerInterface->appMenuForSurface(serverSurface), nullptr);
+    QVERIFY(!m_appmenuManagerInterface->appMenuForSurface(serverSurface));
 }
 
 QTEST_GUILESS_MAIN(TestAppmenu)
 #include "test_wayland_appmenu.moc"