diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/download/SDKDownloader.java b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/download/SDKDownloader.java
index 188e0bf92b3..2a4475a8278 100644
--- a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/download/SDKDownloader.java
+++ b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/download/SDKDownloader.java
@@ -62,8 +62,8 @@ public class SDKDownloader {
     }
 
     private void downloadAbi() {
-        download("https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-" + ANDROID_VERSION + "_r03.zip", armImage);  //Same for all platforms
-        download("https://dl.google.com/android/repository/sys-img/android/sysimg_x86-" + ANDROID_VERSION + "_r05.zip", x86Image);  //Same for all platforms
+        download("https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-" + ANDROID_VERSION + "_r05.zip", armImage);  //Same for all platforms
+        download("https://dl.google.com/android/repository/sys-img/android/x86-" + ANDROID_VERSION + "_r06.zip", x86Image);  //Same for all platforms
     }
 
     public void downloadPlatformTools() {
diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/emulator/Emulator.java b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/emulator/Emulator.java
index 5a2dc54e09e..fd90face6f4 100644
--- a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/emulator/Emulator.java
+++ b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/emulator/Emulator.java
@@ -74,7 +74,10 @@ public class Emulator {
         commandLine.setExePath(pathManager.getToolsFolderInAndroidSdk() + "/" + emulatorCmdName);
         commandLine.addParameter("-avd");
         commandLine.addParameter("my_avd");
-        commandLine.addParameter("-no-audio");
+        if (platform != X86) {
+            //problem with qemu options
+            commandLine.addParameter("-no-audio");
+        }
         commandLine.addParameter("-no-window");
         return commandLine;
     }