@@ -221,28 +221,17 @@ Item {
221221
222222 function test_languageChange() {
223223 var page = goToPage("languagePage");
224− tap(findChild(page, "languageCombo"));
225− waitForRendering(findChild(page, "languageDelegate1"));
226−
227− // For some reason, the delegate *sometimes* (like 1 in 10 maybe)
228− // needs more time before it can process a tap() call. I can't
229− // find a rhyme or reason, its properties all seem the same in
230− // cases where it works and does not. This failure to receive a
231− // tap() call below does *not* happen when running in xvfb, so
232− // jenkins is unaffected (and we don't have to worry about 100 not
233− // being enough time in its slow environment). This wait() call is
234− // just to help local runs not trip up.
235− wait(100);
236− tap(findChild(page, "languageDelegate1"));
237−
238− tryCompare(i18n, "language", "fr");
224+ tap(findChild(page, "languageDelegate1")); // should invoke "fr" lang
225+
226+ tryCompare(i18n, "language", "fr_FR");
239227 tap(findChild(page, "forwardButton"));
240228 tryCompare(updateSessionLanguageSpy, "count", 1);
241− compare(updateSessionLanguageSpy.signalArguments[0][0], "fr");
229+ compare(updateSessionLanguageSpy.signalArguments[0][0], "fr_FR");
242230 }
243231
244232 function test_languageNoChange() {
245− goToPage("simPage"); // one past language page
233+ var page = goToPage("languagePage"); // one past language page
234+ tap(findChild(page, "forwardButton"));
246235 compare(updateSessionLanguageSpy.count, 0);
247236 }
248237
@@ -449,7 +438,7 @@ Item {
449438 }
450439
451440 function test_locationGpsOnly() {
452− var page = goToPage("locationPage");
441+ var page = goToPage("locationPage", true);
453442 var gpsCheck = findChild(page, "gpsCheckLabel");
454443 var hereCheck = findChild(page, "hereCheckLabel");
455444 var nopeCheck = findChild(page, "nopeCheckLabel");