diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts
index 5750fa08790..a256adf9146 100644
--- a/compiler/android-tests/build.gradle.kts
+++ b/compiler/android-tests/build.gradle.kts
@@ -38,5 +38,10 @@ projectTest {
     doFirst {
         environment("kotlin.tests.android.timeout", "45")
     }
+
+    if (project.hasProperty("teamcity") || project.hasProperty("kotlin.test.android.teamcity")) {
+        systemProperty("kotlin.test.android.teamcity", true)
+    }
+
     workingDir = rootDir
 }
diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.kt b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.kt
index f0903fb646a..37d6fb39cd7 100644
--- a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.kt
+++ b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.kt
@@ -33,11 +33,16 @@ import javax.xml.parsers.ParserConfigurationException
 
 class CodegenTestsOnAndroidRunner private constructor(private val pathManager: PathManager) {
 
+    private val isTeamcity = System.getProperty("kotlin.test.android.teamcity") != null || System.getenv("TEAMCITY_VERSION") != null
+
     private fun runTestsInEmulator(): TestSuite {
         val rootSuite = TestSuite("Root")
 
         downloadDependencies()
-        val emulator = Emulator(pathManager, Emulator.ARM)
+
+        val emulatorType = if (isTeamcity) Emulator.ARM else Emulator.X86
+        println("Using $emulatorType emulator!")
+        val emulator = Emulator(pathManager, emulatorType)
         emulator.createEmulator()
 
         val gradleRunner = GradleRunner(pathManager)