diff --git a/src/modules/partition/tests/CMakeLists.txt b/src/modules/partition/tests/CMakeLists.txt
index dd4e41068..f16435230 100644
--- a/src/modules/partition/tests/CMakeLists.txt
+++ b/src/modules/partition/tests/CMakeLists.txt
@@ -40,3 +40,21 @@ calamares_add_test(
     DEFINITIONS ${_partition_defs}
 )
 
+
+calamares_add_test(
+    createlayoutstests
+    SOURCES
+        ${PartitionModule_SOURCE_DIR}/core/KPMHelpers.cpp
+        ${PartitionModule_SOURCE_DIR}/core/PartitionInfo.cpp
+        ${PartitionModule_SOURCE_DIR}/core/PartitionLayout.cpp
+        ${PartitionModule_SOURCE_DIR}/core/PartUtils.cpp
+        ${PartitionModule_SOURCE_DIR}/core/DeviceModel.cpp
+        CreateLayoutsTests.cpp
+    LIBRARIES
+        kpmcore
+        calamares
+        calamaresui
+        Qt5::Gui
+    DEFINITIONS ${_partition_defs}
+)
+
diff --git a/src/modules/partition/tests/CreateLayoutsTests.cpp b/src/modules/partition/tests/CreateLayoutsTests.cpp
new file mode 100644
index 000000000..dab49c2b0
--- /dev/null
+++ b/src/modules/partition/tests/CreateLayoutsTests.cpp
@@ -0,0 +1,145 @@
+/* === This file is part of Calamares - <https://calamares.io> ===
+ *
+ *   SPDX-FileCopyrightText: 2020 Corentin Noël <corentin.noel@collabora.com>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#include "CreateLayoutsTests.h"
+
+#include "core/PartitionLayout.h"
+
+#include "utils/Logger.h"
+#include "partition/KPMManager.h"
+#include "JobQueue.h"
+
+#include <core/lvmdevice.h>
+#include <core/partition.h>
+#include <fs/filesystemfactory.h>
+
+#include <memory>
+
+#include <QtTest/QtTest>
+
+class PartitionTable;
+class SmartStatus;
+
+QTEST_GUILESS_MAIN( CreateLayoutsTests )
+
+CalamaresUtils::Partition::KPMManager* kpmcore = nullptr;
+
+using CalamaresUtils::operator""_MiB;
+using CalamaresUtils::operator""_GiB;
+
+#define LOGICAL_SIZE 512
+
+CreateLayoutsTests::CreateLayoutsTests()
+{
+    Logger::setupLogLevel( Logger::LOGDEBUG );
+}
+
+void
+CreateLayoutsTests::init()
+{
+    std::unique_ptr< Calamares::JobQueue > jobqueue_p( new Calamares::JobQueue( nullptr ) );
+    kpmcore = new CalamaresUtils::Partition::KPMManager();
+}
+
+void
+CreateLayoutsTests::cleanup()
+{
+    delete kpmcore;
+}
+
+void
+CreateLayoutsTests::testFixedSizePartition()
+{
+    PartitionLayout layout = PartitionLayout();
+    TestDevice dev( QString( "test" ), LOGICAL_SIZE, 5_GiB/LOGICAL_SIZE );
+    PartitionRole role( PartitionRole::Role::Any );
+    QList< Partition* > partitions;
+
+    if (!layout.addEntry( QString( "/" ), QString( "5MiB" ) ))
+    {
+        QFAIL( qPrintable( "Unable to create / partition" ) );
+    }
+
+    partitions = layout.execute( static_cast<Device *>(&dev), 0, dev.totalLogical(), nullptr, nullptr, role );
+
+    QCOMPARE( partitions.count(), 1 );
+
+    QCOMPARE( partitions[0]->length(), 5_MiB/LOGICAL_SIZE );
+}
+
+void
+CreateLayoutsTests::testPercentSizePartition()
+{
+    PartitionLayout layout = PartitionLayout();
+    TestDevice dev( QString( "test" ), LOGICAL_SIZE, 5_GiB/LOGICAL_SIZE );
+    PartitionRole role( PartitionRole::Role::Any );
+    QList< Partition* > partitions;
+
+    if (!layout.addEntry( QString( "/" ), QString( "50%" ) ))
+    {
+        QFAIL( qPrintable( "Unable to create / partition" ) );
+    }
+
+    partitions = layout.execute( static_cast<Device *>(&dev), 0, dev.totalLogical(), nullptr, nullptr, role );
+
+    QCOMPARE( partitions.count(), 1 );
+
+    QCOMPARE( partitions[0]->length(), (5_GiB/2)/LOGICAL_SIZE );
+}
+
+void
+CreateLayoutsTests::testMixedSizePartition()
+{
+    PartitionLayout layout = PartitionLayout();
+    TestDevice dev( QString( "test" ), LOGICAL_SIZE, 5_GiB/LOGICAL_SIZE );
+    PartitionRole role( PartitionRole::Role::Any );
+    QList< Partition* > partitions;
+
+    if (!layout.addEntry( QString( "/" ), QString( "5MiB" ) ))
+    {
+        QFAIL( qPrintable( "Unable to create / partition" ) );
+    }
+
+    if (!layout.addEntry( QString( "/home" ), QString( "50%" ) ))
+    {
+        QFAIL( qPrintable( "Unable to create /home partition" ) );
+    }
+
+    if (!layout.addEntry( QString( "/bkup" ), QString( "50%" ) ))
+    {
+        QFAIL( qPrintable( "Unable to create /bkup partition" ) );
+    }
+
+    partitions = layout.execute( static_cast<Device *>(&dev), 0, dev.totalLogical(), nullptr, nullptr, role );
+
+    QCOMPARE( partitions.count(), 3 );
+
+    QCOMPARE( partitions[0]->length(), 5_MiB/LOGICAL_SIZE );
+    QCOMPARE( partitions[1]->length(), ((5_GiB - 5_MiB)/2)/LOGICAL_SIZE );
+    QCOMPARE( partitions[2]->length(), ((5_GiB - 5_MiB)/2)/LOGICAL_SIZE );
+}
+
+// TODO: Get a clean way to instanciate a test Device from KPMCore
+class DevicePrivate
+{
+public:
+    QString m_Name;
+    QString m_DeviceNode;
+    qint64  m_LogicalSectorSize;
+    qint64  m_TotalLogical;
+    PartitionTable* m_PartitionTable;
+    QString m_IconName;
+    std::shared_ptr<SmartStatus> m_SmartStatus;
+    Device::Type m_Type;
+};
+
+TestDevice::TestDevice(const QString& name, const qint64 logicalSectorSize, const qint64 totalLogicalSectors)
+    : Device (std::make_shared<DevicePrivate>(), name, QString( "node" ), logicalSectorSize, totalLogicalSectors, QString(), Device::Type::Unknown_Device)
+{
+}
diff --git a/src/modules/partition/tests/CreateLayoutsTests.h b/src/modules/partition/tests/CreateLayoutsTests.h
new file mode 100644
index 000000000..9d37d7067
--- /dev/null
+++ b/src/modules/partition/tests/CreateLayoutsTests.h
@@ -0,0 +1,36 @@
+/* === This file is part of Calamares - <https://calamares.io> ===
+ *
+ *   SPDX-FileCopyrightText: 2020 Corentin Noël <corentin.noel@collabora.com>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#ifndef CLEARMOUNTSJOBTESTS_H
+#define CLEARMOUNTSJOBTESTS_H
+
+#include <QObject>
+#include <core/device.h>
+
+class CreateLayoutsTests : public QObject
+{
+    Q_OBJECT
+public:
+    CreateLayoutsTests();
+
+private Q_SLOTS:
+    void testFixedSizePartition();
+    void testPercentSizePartition();
+    void testMixedSizePartition();
+    void init();
+    void cleanup();
+};
+
+class TestDevice : public Device
+{
+public:
+    TestDevice(const QString& name, const qint64 logicalSectorSize, const qint64 totalLogicalSectors);
+};
+
+#endif