diff --git a/src/libkdepim/progresswidget/autotests/kdepimtest_layout.h b/src/libkdepim/progresswidget/autotests/kdepimtest_layout.h
deleted file mode 100644
index 6dbb618..0000000
--- a/src/libkdepim/progresswidget/autotests/kdepimtest_layout.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-   Copyright (C) 2019 Montel Laurent <montel@kde.org>
-
-   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; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef KDEPIMTEST_LAYOUT_H
-#define KDEPIMTEST_LAYOUT_H
-#include <QTest>
-#include <QLayout>
-namespace KdepimTestLayout
-{
-void checkContentsMargins(int margin, QLayout *layout)
-{
-    int top = -1;
-    int bottom = -1;
-    int left = -1;
-    int right = -1;
-    layout->getContentsMargins(&left, &top, &right, &bottom);
-    QCOMPARE(top, margin);
-    QCOMPARE(left, margin);
-    QCOMPARE(bottom, margin);
-    QCOMPARE(right, margin);
-}
-}
-
-#endif
diff --git a/src/libkdepim/progresswidget/autotests/statusbarprogresswidgettest.cpp b/src/libkdepim/progresswidget/autotests/statusbarprogresswidgettest.cpp
index 3d6169d..136cb36 100644
--- a/src/libkdepim/progresswidget/autotests/statusbarprogresswidgettest.cpp
+++ b/src/libkdepim/progresswidget/autotests/statusbarprogresswidgettest.cpp
@@ -1,82 +1,81 @@
 /*
    Copyright (C) 2017-2019 Laurent Montel <montel@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 "statusbarprogresswidgettest.h"
 #include "../statusbarprogresswidget.h"
 #include "../progressdialog.h"
 #include "../progressmanager.h"
-#include "kdepimtest_layout.h"
 #include <QTest>
 #include <QHBoxLayout>
 #include <QPushButton>
 #include <QStackedWidget>
 #include <QProgressBar>
 #include <QStandardPaths>
 #include <progresswidget/ssllabel.h>
 QTEST_MAIN(StatusbarProgressWidgetTest)
 
 StatusbarProgressWidgetTest::StatusbarProgressWidgetTest(QObject *parent)
     : QObject(parent)
 {
     QStandardPaths::setTestModeEnabled(true);
 }
 
 void StatusbarProgressWidgetTest::shouldHaveDefaultValue()
 {
     QWidget *widget = new QWidget;
     KPIM::ProgressDialog *progress = new KPIM::ProgressDialog(widget, widget);
     KPIM::StatusbarProgressWidget w(progress, widget);
     QHBoxLayout *boxLayout = w.findChild<QHBoxLayout *>(QStringLiteral("boxLayout"));
     QVERIFY(boxLayout);
-    KdepimTestLayout::checkContentsMargins(0, boxLayout);
+    QCOMPARE(boxLayout->contentsMargins(), QMargins(0, 0, 0, 0));
     QCOMPARE(boxLayout->spacing(), 0);
 
     QPushButton *mButton = w.findChild<QPushButton *>(QStringLiteral("button"));
     QVERIFY(mButton);
     QVERIFY(mButton->text().isEmpty());
 
     QStackedWidget *mStackedWidget = w.findChild<QStackedWidget *>(QStringLiteral("stackedwidget"));
     QVERIFY(mStackedWidget);
 
     KPIM::SSLLabel *mSslLabel = w.findChild<KPIM::SSLLabel *>(QStringLiteral("ssllabel"));
     QVERIFY(mSslLabel);
 
     QProgressBar *mProgressBar = w.findChild<QProgressBar *>(QStringLiteral("progressbar"));
     QVERIFY(mProgressBar);
 
     QLabel *mLabel = w.findChild<QLabel *>(QStringLiteral("emptylabel"));
     QVERIFY(mLabel);
 }
 
 void StatusbarProgressWidgetTest::shouldShowItems()
 {
     /*
     QWidget *widget = new QWidget;
     KPIM::ProgressDialog *progress = new KPIM::ProgressDialog(widget, widget);
     KPIM::StatusbarProgressWidget w(progress, widget);
     w.show();
     QPushButton *mButton = w.findChild<QPushButton *>(QStringLiteral("button"));
 
     QProgressBar *mProgressBar = w.findChild<QProgressBar *>(QStringLiteral("progressbar"));
     QVERIFY(!mProgressBar->isVisible());
 
     KPIM::ProgressManager::createProgressItem(KPIM::ProgressManager::getUniqueID(), QStringLiteral("Title"), QString(), true);
     QVERIFY(mProgressBar->isVisible());
     */
 }