diff --git a/autotests/alternativesmodeltest.cpp b/autotests/alternativesmodeltest.cpp
index 4f2281e..6a70e42 100644
--- a/autotests/alternativesmodeltest.cpp
+++ b/autotests/alternativesmodeltest.cpp
@@ -1,195 +1,195 @@
 /************************************************************************************
  * Copyright (C) 2014 Aleix Pol Gonzalez <aleixpol@blue-systems.com>                *
  *                                                                                  *
  * This program is free software; you can redistribute it and/or                    *
  * modify it under the terms of the GNU General Public License                      *
  * as published by the Free Software Foundation; either version 2                   *
  * of the License, or (at your option) any later version.                           *
  *                                                                                  *
  * This program 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 General Public License for more details.                                     *
  *                                                                                  *
  * You should have received a copy of the GNU General Public License                *
  * along with this program; if not, write to the Free Software                      *
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA   *
  ************************************************************************************/
 
 #include <qtest.h>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QStandardPaths>
 #include <QSignalSpy>
 
 #include <KSharedConfig>
 #include <KConfigGroup>
 
 #include "alternativesmodeltest.h"
 #include <purpose/job.h>
 #include <purpose/alternativesmodel.h>
 #include <purpose/configuration.h>
 
 QTEST_GUILESS_MAIN(AlternativesModelTest)
 
 int saveAsRow(Purpose::AlternativesModel* model)
 {
     for(int i=0, c=model->rowCount(); i<c; ++i) {
         QString pluginId = model->index(i).data(Purpose::AlternativesModel::PluginIdRole).toString();
         if (pluginId == QLatin1String("saveasplugin")) {
             return i;
         }
     }
 
     Q_ASSERT(!"Couldn't find the saveas plugin");
     return -1;
 }
 
 void AlternativesModelTest::runJobTest()
 {
     Purpose::AlternativesModel model;
 
     const QString tempfile = QStandardPaths::writableLocation(QStandardPaths::TempLocation) + QStringLiteral("/purposetest");
     QFile::remove(tempfile);
     QJsonObject input = QJsonObject {
         {QStringLiteral("urls"), QJsonArray {QStringLiteral("http://kde.org")} },
         {QStringLiteral("mimeType"), QStringLiteral("dummy/thing") }
     };
     model.setInputData(input);
 
     model.setPluginType(QStringLiteral("Export"));
     model.setDisabledPlugins({});
 
     Purpose::Configuration* conf = model.configureJob(saveAsRow(&model));
     QVERIFY(!conf->isReady());
     QVERIFY(!conf->createJob());
     input.insert(QStringLiteral("destinationPath"), QUrl::fromLocalFile(tempfile).url()),
     conf->setData(input);
     QVERIFY(conf->isReady());
     Purpose::Job* job = conf->createJob();
     QVERIFY(job);
     QSignalSpy s(job, &KJob::finished);
     QSignalSpy sOutput(job, &Purpose::Job::outputChanged);
     job->start();
-    QVERIFY(s.count() || s.wait());
+    QTRY_COMPARE(s.count(), 1);
     if (job->error()) {
         qWarning() << "error!" << job->error() << job->errorString() << job->errorText();
     }
     QCOMPARE(sOutput.count(), 1);
     QCOMPARE(job->error(), 0);
     QVERIFY(QFile::remove(tempfile));
 }
 
 void AlternativesModelTest::bigBufferTest()
 {
     Purpose::AlternativesModel model;
 
     const QByteArray payload(1920*1080*4, 'x');
     const QString uri = QStringLiteral("data:text/plain;base64,") + QString::fromLatin1(payload.toBase64());
 
     const QString tempfile = QStandardPaths::writableLocation(QStandardPaths::TempLocation) + QStringLiteral("/purposetest");
     QFile::remove(tempfile);
     const QJsonObject input = {
         {QStringLiteral("urls"), QJsonArray {uri} },
         {QStringLiteral("mimeType"), QStringLiteral("dummy/thing") },
         {QStringLiteral("destinationPath"), QUrl::fromLocalFile(tempfile).url()}
     };
     model.setInputData(input);
     model.setPluginType(QStringLiteral("Export"));
     model.setDisabledPlugins({});
 
     Purpose::Configuration* conf = model.configureJob(saveAsRow(&model));
     QVERIFY(conf->isReady());
     conf->setUseSeparateProcess(false);
     Purpose::Job* job = conf->createJob();
     QVERIFY(job);
     QSignalSpy s(job, &KJob::finished);
     QSignalSpy sOutput(job, &Purpose::Job::outputChanged);
     job->start();
-    QVERIFY(s.count() || s.wait());
+    QTRY_COMPARE(s.count(), 1);
     if (job->error()) {
         qWarning() << "error!" << job->error() << job->errorString() << job->errorText();
     }
     QCOMPARE(sOutput.count(), 1);
     QCOMPARE(job->error(), 0);
 
     QFileInfo fi(tempfile);
     QCOMPARE(fi.size(), payload.size());
     QVERIFY(QFile::remove(tempfile));
 }
 
 void AlternativesModelTest::disablePluginTest()
 {
     const auto listPlugins = [] {
         QStringList plugins;
         Purpose::AlternativesModel model;
         QJsonObject input = QJsonObject {
             {QStringLiteral("urls"), QJsonArray {QStringLiteral("http://kde.org")} },
             {QStringLiteral("mimeType"), QStringLiteral("dummy/thing") }
         };
         model.setInputData(input);
         model.setPluginType(QStringLiteral("Export"));
         model.setDisabledPlugins({});
 
         for (int i = 0; i < model.rowCount(); ++i) {
             plugins << model.index(i).data(Purpose::AlternativesModel::PluginIdRole).toString();
         }
         return plugins;
     };
 
     auto plugins = listPlugins();
     QVERIFY(plugins.contains(QStringLiteral("saveasplugin")));
     QVERIFY(plugins.contains(QStringLiteral("emailplugin")));
 
     QStandardPaths::setTestModeEnabled(true);
     auto config = KSharedConfig::openConfig(QStringLiteral("purposerc"));
     auto group = config->group("plugins");
     group.writeEntry("disabled", QStringList{ QStringLiteral("saveasplugin"), QStringLiteral("emailplugin") });
 
     plugins = listPlugins();
     QVERIFY(!plugins.contains(QStringLiteral("saveasplugin")));
     QVERIFY(!plugins.contains(QStringLiteral("emailplugin")));
 
     // "cleanup"
     group.writeEntry("disabled", QStringList());
 }
 
 void AlternativesModelTest::blacklistTest()
 {
     const auto listPlugins = [](const QStringList &blacklist) {
         QStringList plugins;
         Purpose::AlternativesModel model;
         QJsonObject input = QJsonObject {
             {QStringLiteral("urls"), QJsonArray {QStringLiteral("http://kde.org")} },
             {QStringLiteral("mimeType"), QStringLiteral("dummy/thing") }
         };
         model.setInputData(input);
         model.setPluginType(QStringLiteral("Export"));
         if (!blacklist.isEmpty()) {
             model.setDisabledPlugins(blacklist);
         }
 
         for (int i = 0; i < model.rowCount(); ++i) {
             plugins << model.index(i).data(Purpose::AlternativesModel::PluginIdRole).toString();
         }
         return plugins;
     };
 
     auto plugins = listPlugins(QStringList());
     QVERIFY(plugins.contains(QStringLiteral("emailplugin")));
 
     plugins = listPlugins({QStringLiteral("emailplugin")});
     QVERIFY(!plugins.contains(QStringLiteral("emailplugin")));
 
     plugins = listPlugins({QStringLiteral("saveasplugin")});
     QVERIFY(plugins.contains(QStringLiteral("emailplugin")));
 
     // Admin settings have precedence
     QStandardPaths::setTestModeEnabled(true);
     auto config = KSharedConfig::openConfig(QStringLiteral("purposerc"));
     auto group = config->group("plugins");
     group.writeEntry("disabled", QStringList{ QStringLiteral("emailplugin") });
 
     plugins = listPlugins({QStringLiteral("saveasplugin")});
     QVERIFY(!plugins.contains(QStringLiteral("emailplugin")));
 }