diff --git a/src/libcalamares/Tests.cpp b/src/libcalamares/Tests.cpp
index 615cb51a7..40cb480e9 100644
--- a/src/libcalamares/Tests.cpp
+++ b/src/libcalamares/Tests.cpp
@@ -18,9 +18,12 @@
 
 #include "Tests.h"
 
+#include "utils/CalamaresUtilsSystem.h"
 #include "utils/Logger.h"
 #include "utils/Yaml.h"
 
+#include <QTemporaryFile>
+
 #include <QtTest/QtTest>
 
 QTEST_GUILESS_MAIN( LibCalamaresTests )
@@ -113,3 +116,21 @@ LibCalamaresTests::testLoadSaveYamlExtended()
     }
     QFile::remove( "out.yaml" );
 }
+
+void
+LibCalamaresTests::testCommands()
+{
+    using CalamaresUtils::System;
+    auto r = System::runCommand(
+        System::RunLocation::RunInHost,
+        { "/bin/ls", "/tmp" }
+        );
+
+    QVERIFY( r.getExitCode() == 0 );
+
+    QTemporaryFile tf( "/tmp/calamares-test-XXXXXX" );
+    QVERIFY( tf.open() );
+    QVERIFY( !tf.fileName().isEmpty() );
+
+    QVERIFY( r.getOutput().contains( tf.fileName() ) );
+}
diff --git a/src/libcalamares/Tests.h b/src/libcalamares/Tests.h
index 8d0aee1ff..5cdb3912b 100644
--- a/src/libcalamares/Tests.h
+++ b/src/libcalamares/Tests.h
@@ -34,6 +34,8 @@ private Q_SLOTS:
 
     void testLoadSaveYaml();  // Just settings.conf
     void testLoadSaveYamlExtended();  // Do a find() in the src dir
+
+    void testCommands();
 };
 
 #endif