diff --git a/autotests/libs/fakesession.cpp b/autotests/libs/fakesession.cpp
index 68ed60fe1..888155883 100644
--- a/autotests/libs/fakesession.cpp
+++ b/autotests/libs/fakesession.cpp
@@ -1,92 +1,97 @@
 /*
     Copyright (c) 2009 Stephen Kelly <steveire@gmail.com>
 
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     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 Library General Public
     License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
 
 #include "fakesession.h"
 #include "session_p.h"
 #include "job.h"
 #include "private/protocol_p.h"
 
 #include <QCoreApplication>
+#include <QTimer>
 
 class FakeSessionPrivate : public SessionPrivate
 {
 public:
     FakeSessionPrivate(FakeSession *parent, FakeSession::Mode mode)
         : SessionPrivate(parent), q_ptr(parent), m_mode(mode)
     {
         protocolVersion = Protocol::version();
     }
 
     /* reimp */
     void init(const QByteArray &id) override
     {
         // trimmed down version of the real SessionPrivate::init(), without any server access
         if (!id.isEmpty()) {
             sessionId = id;
         } else {
             sessionId = QCoreApplication::instance()->applicationName().toUtf8()
             + '-' + QByteArray::number(qrand());
         }
 
         connected = false;
         theNextTag = 1;
         jobRunning = false;
 
         reconnect();
     }
 
     /* reimp */
     void reconnect() override
     {
         if (m_mode == FakeSession::EndJobsImmediately) {
             return;
         }
 
-        Q_EMIT q_ptr->reconnected();
-        connected = true;
-        startNext();
+        // Like Session does: delay the actual disconnect+reconnect
+        QTimer::singleShot(10, q_ptr, [&]() {
+            socketDisconnected();
+            Q_EMIT q_ptr->reconnected();
+            connected = true;
+            startNext();
+        });
     }
 
     /* reimp */
     void addJob(Job *job) override
     {
         Q_EMIT q_ptr->jobAdded(job);
         // Return immediately so that no actual communication happens with the server and
         // the started jobs are completed.
         if (m_mode == FakeSession::EndJobsImmediately) {
             endJob(job);
         } else {
             SessionPrivate::addJob(job);
         }
     }
 
     FakeSession *q_ptr;
     FakeSession::Mode m_mode;
 };
 
 FakeSession::FakeSession(const QByteArray &sessionId, FakeSession::Mode mode, QObject *parent)
     : Session(new FakeSessionPrivate(this, mode), sessionId, parent)
 {
 
 }
 
 void FakeSession::setAsDefaultSession()
 {
     d->setDefaultSession(this);
 }
diff --git a/autotests/libs/jobtest.cpp b/autotests/libs/jobtest.cpp
index 4528ebd8d..bff057c26 100644
--- a/autotests/libs/jobtest.cpp
+++ b/autotests/libs/jobtest.cpp
@@ -1,192 +1,242 @@
 /*
     Copyright (c) 2012 Volker Krause <vkrause@kde.org>
 
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     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 Library General Public
     License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
 
 #include <qtest_akonadi.h>
 
 #include "fakesession.h"
 #include "job.h"
 
 Q_DECLARE_METATYPE(KJob *)
 Q_DECLARE_METATYPE(Akonadi::Job *)
 
 using namespace Akonadi;
 
 class FakeJob : public Job
 {
     Q_OBJECT
 public:
     explicit FakeJob(QObject *parent = nullptr) : Job(parent) {}
     void done()
     {
         emitResult();
     }
 protected:
     void doStart() override { emitWriteFinished(); }
 };
 
 class JobTest : public QObject
 {
     Q_OBJECT
 private Q_SLOTS:
     void initTestCase()
     {
         qRegisterMetaType<KJob *>();
         qRegisterMetaType<Akonadi::Job *>();
     }
 
     void testTopLevelJobExecution()
     {
         FakeSession session("fakeSession", FakeSession::EndJobsManually);
 
         QSignalSpy sessionQueueSpy(&session, SIGNAL(jobAdded(Akonadi::Job*)));
         QVERIFY(sessionQueueSpy.isValid());
 
         FakeJob *job1 = new FakeJob(&session);
         QSignalSpy job1DoneSpy(job1, SIGNAL(result(KJob*)));
         QVERIFY(job1DoneSpy.isValid());
 
         FakeJob *job2 = new FakeJob(&session);
         QSignalSpy job2DoneSpy(job2, SIGNAL(result(KJob*)));
         QVERIFY(job2DoneSpy.isValid());
 
         QCOMPARE(sessionQueueSpy.size(), 2);
         QCOMPARE(job1DoneSpy.size(), 0);
 
         QSignalSpy job1AboutToStartSpy(job1, &Job::aboutToStart);
         QVERIFY(job1AboutToStartSpy.wait());
 
         QCOMPARE(job1DoneSpy.size(), 0);
 
         job1->done();
         QCOMPARE(job1DoneSpy.size(), 1);
 
         QSignalSpy job2AboutToStartSpy(job2, &Job::aboutToStart);
         QVERIFY(job2AboutToStartSpy.wait());
         QCOMPARE(job2DoneSpy.size(), 0);
         job2->done();
 
         QCOMPARE(job1DoneSpy.size(), 1);
         QCOMPARE(job2DoneSpy.size(), 1);
     }
 
     void testKillSession()
     {
         FakeSession session("fakeSession", FakeSession::EndJobsManually);
 
         QSignalSpy sessionQueueSpy(&session, SIGNAL(jobAdded(Akonadi::Job*)));
         QVERIFY(sessionQueueSpy.isValid());
         QSignalSpy sessionReconnectSpy(&session, SIGNAL(reconnected()));
         QVERIFY(sessionReconnectSpy.isValid());
 
         FakeJob *job1 = new FakeJob(&session);
         QSignalSpy job1DoneSpy(job1, SIGNAL(result(KJob*)));
         QVERIFY(job1DoneSpy.isValid());
 
         FakeJob *job2 = new FakeJob(&session);
         QSignalSpy job2DoneSpy(job2, SIGNAL(result(KJob*)));
         QVERIFY(job2DoneSpy.isValid());
 
         QCOMPARE(sessionQueueSpy.size(), 2);
         QSignalSpy job1AboutToStartSpy(job1, &Job::aboutToStart);
         QVERIFY(job1AboutToStartSpy.wait());
 
         // one job running, one queued, now kill the session
         session.clear();
         QVERIFY(sessionReconnectSpy.wait());
 
         QCOMPARE(job1DoneSpy.size(), 1);
         QCOMPARE(job2DoneSpy.size(), 1);
-        QCOMPARE(sessionReconnectSpy.size(), 1); // the first one is missed as it happens directly from the ctor
+        QCOMPARE(sessionReconnectSpy.size(), 2);
     }
 
     void testKillQueuedJob()
     {
         FakeSession session("fakeSession", FakeSession::EndJobsManually);
 
         QSignalSpy sessionQueueSpy(&session, SIGNAL(jobAdded(Akonadi::Job*)));
         QVERIFY(sessionQueueSpy.isValid());
         QSignalSpy sessionReconnectSpy(&session, SIGNAL(reconnected()));
         QVERIFY(sessionReconnectSpy.isValid());
 
         FakeJob *job1 = new FakeJob(&session);
         QSignalSpy job1DoneSpy(job1, SIGNAL(result(KJob*)));
         QVERIFY(job1DoneSpy.isValid());
 
         FakeJob *job2 = new FakeJob(&session);
         QSignalSpy job2DoneSpy(job2, SIGNAL(result(KJob*)));
         QVERIFY(job2DoneSpy.isValid());
 
         QCOMPARE(sessionQueueSpy.size(), 2);
         QSignalSpy job1AboutToStartSpy(job1, &Job::aboutToStart);
         QVERIFY(job1AboutToStartSpy.wait());
 
         // one job running, one queued, now kill the waiting job
         QVERIFY(job2->kill(KJob::EmitResult));
 
         QCOMPARE(job1DoneSpy.size(), 0);
         QCOMPARE(job2DoneSpy.size(), 1);
 
         job1->done();
         QCOMPARE(job1DoneSpy.size(), 1);
         QCOMPARE(job2DoneSpy.size(), 1);
-        QCOMPARE(sessionReconnectSpy.size(), 0); // the first one is missed as it happens directly from the ctor
+        QCOMPARE(sessionReconnectSpy.size(), 1);
     }
 
     void testKillRunningJob()
     {
         FakeSession session("fakeSession", FakeSession::EndJobsManually);
 
         QSignalSpy sessionQueueSpy(&session, SIGNAL(jobAdded(Akonadi::Job*)));
         QVERIFY(sessionQueueSpy.isValid());
         QSignalSpy sessionReconnectSpy(&session, SIGNAL(reconnected()));
         QVERIFY(sessionReconnectSpy.isValid());
 
         FakeJob *job1 = new FakeJob(&session);
         QSignalSpy job1DoneSpy(job1, SIGNAL(result(KJob*)));
         QVERIFY(job1DoneSpy.isValid());
 
         FakeJob *job2 = new FakeJob(&session);
         QSignalSpy job2DoneSpy(job2, SIGNAL(result(KJob*)));
         QVERIFY(job2DoneSpy.isValid());
 
         QCOMPARE(sessionQueueSpy.size(), 2);
         QSignalSpy job1AboutToStartSpy(job1, &Job::aboutToStart);
         QVERIFY(job1AboutToStartSpy.wait());
 
         // one job running, one queued, now kill the running one
         QVERIFY(job1->kill(KJob::EmitResult));
 
         QCOMPARE(job1DoneSpy.size(), 1);
         QCOMPARE(job2DoneSpy.size(), 0);
 
         // session needs to reconnect, then execute the next job
         QSignalSpy job2AboutToStartSpy(job2, &Job::aboutToStart);
         QVERIFY(job2AboutToStartSpy.wait());
-        QCOMPARE(sessionReconnectSpy.size(), 1);
+        QCOMPARE(sessionReconnectSpy.size(), 2);
         job2->done();
 
         QCOMPARE(job1DoneSpy.size(), 1);
         QCOMPARE(job2DoneSpy.size(), 1);
-        QCOMPARE(sessionReconnectSpy.size(), 1); // the first one is missed as it happens directly from the ctor
+        QCOMPARE(sessionReconnectSpy.size(), 2);
+    }
+
+    void testKillRunningSubjob()
+    {
+        FakeSession session("fakeSession", FakeSession::EndJobsManually);
+
+        QSignalSpy sessionQueueSpy(&session, &FakeSession::jobAdded);
+        QSignalSpy sessionReconnectSpy(&session, &Session::reconnected);
+
+        FakeJob *parentJob = new FakeJob(&session);
+        parentJob->setObjectName(QStringLiteral("parentJob"));
+        QSignalSpy parentJobDoneSpy(parentJob, &KJob::result);
+
+        FakeJob *subjob = new FakeJob(parentJob);
+        subjob->setObjectName(QStringLiteral("subjob"));
+        QSignalSpy subjobDoneSpy(subjob, &KJob::result);
+
+        FakeJob *subjob2 = new FakeJob(parentJob);
+        subjob2->setObjectName(QStringLiteral("subjob2"));
+        QSignalSpy subjob2DoneSpy(subjob2, &KJob::result);
+
+        FakeJob *nextJob = new FakeJob(&session);
+        nextJob->setObjectName(QStringLiteral("nextJob"));
+        QSignalSpy nextJobDoneSpy(nextJob, &KJob::result);
+
+        QCOMPARE(sessionQueueSpy.size(), 2);
+        QSignalSpy parentJobAboutToStart(parentJob, &Job::aboutToStart);
+        QVERIFY(parentJobAboutToStart.wait());
+
+        QSignalSpy subjobAboutToStart(subjob, &Job::aboutToStart);
+        QVERIFY(subjobAboutToStart.wait());
+
+        // one parent job, one subjob running (another one waiting), now kill the running subjob
+        QVERIFY(subjob->kill(KJob::EmitResult));
+
+        QCOMPARE(subjobDoneSpy.size(), 1);
+        QCOMPARE(subjob2DoneSpy.size(), 0);
+
+        // Note that killing a subjob aborts the whole parent job
+        // Since the session only knows about the parent
+        QCOMPARE(parentJobDoneSpy.size(), 1);
+
+        // session needs to reconnect, then execute the next job
+        QSignalSpy nextJobAboutToStartSpy(nextJob, &Job::aboutToStart);
+        QVERIFY(nextJobAboutToStartSpy.wait());
+        QCOMPARE(sessionReconnectSpy.size(), 2);
+        nextJob->done();
+
+        QCOMPARE(subjob2DoneSpy.size(), 0);
+        QCOMPARE(nextJobDoneSpy.size(), 1);
     }
 };
 
 QTEST_AKONADIMAIN(JobTest)
 
 #include "jobtest.moc"