diff --git a/apps/calendar/test/marionette/lib/calendar.js b/apps/calendar/test/marionette/lib/calendar.js
index 2bd24eec9240..ffa866c15d80 100644
--- a/apps/calendar/test/marionette/lib/calendar.js
+++ b/apps/calendar/test/marionette/lib/calendar.js
@@ -277,7 +277,10 @@ Calendar.prototype = {
     // need to go back to top most frame before being able to switch to
     // a different app!!!
     client.switchToFrame();
-    client.apps.switchToApp('app://keyboard.gaiamobile.org');
+
+    var keyboardFrame = client.findElement(
+      'iframe[src*="app://keyboard.gaiamobile.org"]');
+    client.switchToFrame(keyboardFrame);
     client.waitFor(function() {
       return client.executeScript(function() {
         return document.hidden;