diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp
index 88f6c804b..2ebc1d5b2 100644
--- a/src/calamares/testmain.cpp
+++ b/src/calamares/testmain.cpp
@@ -26,9 +26,10 @@
 #include "utils/YamlUtils.h"
 #include "modulesystem/Module.h"
 
-#include "Settings.h"
+#include "GlobalStorage.h"
 #include "Job.h"
 #include "JobQueue.h"
+#include "Settings.h"
 
 #include <QCommandLineOption>
 #include <QCommandLineParser>
@@ -37,13 +38,17 @@
 
 #include <memory>
 
-struct ModuleConfig : public QPair< QString, QString >
+struct ModuleConfig
 {
-    ModuleConfig( const QString& a, const QString& b ) : QPair< QString, QString >(a, b) { }
-    ModuleConfig() : QPair< QString, QString >( QString(), QString() ) { }
+    QString moduleName() const { return m_module; }
+    QString configFile() const { return m_jobConfig; }
+    QString language() const { return m_language; }
+    QString globalConfigFile() const { return m_globalConfig; }
 
-    QString moduleName() const { return first; }
-    QString configFile() const { return second; }
+    QString m_module;
+    QString m_jobConfig;
+    QString m_globalConfig;
+    QString m_language;
 } ;
 
 static ModuleConfig
@@ -55,6 +60,8 @@ handle_args( QCoreApplication& a )
                                      QStringLiteral( "Global settings document" ), "global.yaml" );
     QCommandLineOption jobOption( QStringList() << QStringLiteral( "j" ) << QStringLiteral( "job"),
                                   QStringLiteral( "Job settings document" ), "job.yaml" );
+    QCommandLineOption langOption( QStringList() << QStringLiteral( "l" ) << QStringLiteral( "language" ),
+                                   QStringLiteral( "Language (global)" ), "languagecode" );
 
     QCommandLineParser parser;
     parser.setApplicationDescription( "Calamares module tester" );
@@ -64,14 +71,12 @@ handle_args( QCoreApplication& a )
     parser.addOption( debugLevelOption );
     parser.addOption( globalOption );
     parser.addOption( jobOption );
+    parser.addOption( langOption );
     parser.addPositionalArgument( "module", "Path or name of module to run." );
     parser.addPositionalArgument( "config", "Path of job-config file to use.", "[config]");
 
     parser.process( a );
 
-    QString globalSettings( parser.value( globalOption ) );
-    QString jobSettings( parser.value( jobOption ) );
-
     if ( parser.isSet( debugLevelOption ) )
     {
         bool ok = true;
@@ -98,10 +103,11 @@ handle_args( QCoreApplication& a )
         return ModuleConfig();  // NOTREACHED
     }
 
+    QString jobSettings( parser.value( jobOption ) );
     if ( jobSettings.isEmpty() && ( args.size() == 2 ) )
         jobSettings = args.at(1);
 
-    return ModuleConfig( args.first(), jobSettings );
+    return ModuleConfig{ args.first(), jobSettings, parser.value( globalOption ), parser.value( langOption ) };
 }
 
 
@@ -173,6 +179,17 @@ main( int argc, char* argv[] )
     std::unique_ptr< Calamares::Settings > settings_p( new Calamares::Settings( QString(), true ) );
     std::unique_ptr< Calamares::JobQueue > jobqueue_p( new Calamares::JobQueue( nullptr ) );
 
+    auto gs = jobqueue_p->globalStorage();
+    if ( !module.globalConfigFile().isEmpty() )
+        gs->loadYaml( module.globalConfigFile() );
+    if ( !module.language().isEmpty() )
+    {
+        QVariantMap vm;
+        vm.insert( "LANG", module.language() );
+        gs->insert( "localeConf", vm );
+    }
+
+
     cDebug() << "Calamares module-loader testing" << module.moduleName();
     Calamares::Module* m = load_module( module );
     if ( !m )