diff --git a/lib/devices/android/adb.js b/lib/devices/android/adb.js
index f7f88a0d4..29ac1393f 100644
--- a/lib/devices/android/adb.js
+++ b/lib/devices/android/adb.js
@@ -756,7 +756,8 @@ ADB.prototype.launchAVD = function (avdName, avdArgs, avdLaunchTimeout,
     if (avdArgs === null) {
       avdArgs = [avdName];
     } else if (typeof avdArgs === "string") {
-      avdArgs = [avdName, avdArgs];
+      avdArgs = avdArgs.split(" ");
+      avdArgs.unshift(avdName);
     }
     var proc = spawn(emulatorBinaryPath.substr(1, emulatorBinaryPath.length - 2),
       avdArgs);