diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.cpp
index b2d1642bdd9..11a6d243059 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.cpp
@@ -181,7 +181,8 @@ void MaemoDeviceConfigurationsSettingsWidget::addConfig()
         wizard.createDeviceConfig();
         m_ui->removeConfigButton->setEnabled(true);
         m_ui->configurationComboBox->setCurrentIndex(m_ui->configurationComboBox->count()-1);
-        testConfig();
+        if (currentConfig()->type() != MaemoDeviceConfig::Emulator)
+            testConfig();
     }
 }
 
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizard.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizard.cpp
index 188c0413a8b..dcbefdf2de0 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizard.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigwizard.cpp
@@ -471,14 +471,14 @@ public:
 
     virtual void initializePage()
     {
-        QString infoText = tr("The new device configuration will now be "
-            "created and a test procedure will be run to check whether "
-            "Qt Creator can connect to the device and to provide some "
-            "information about its features.");
-        if (m_wizardData.deviceType == MaemoDeviceConfig::Emulator) {
-            infoText += QLatin1Char('\n')
-                + tr("Please make sure that Qemu is running, otherwise "
-                     "the test will fail.");
+        QString infoText;
+        if (m_wizardData.deviceType == MaemoDeviceConfig::Physical) {
+            infoText = tr("The new device configuration will now be "
+                "created and a test procedure will be run to check whether "
+                "Qt Creator can connect to the device and to provide some "
+                "information about its features.");
+        } else {
+            infoText = tr("The new device configuration will now be created.");
         }
         m_infoLabel->setText(infoText);
     }