diff --git a/.gitignore b/.gitignore
index 775bc11d..2a529fa3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ tmp
 .idea
 *~
 /.rbx
+/adb_logcat.log
 /exportToHTML
diff --git a/matrix_tests.sh b/matrix_tests.sh
index c485197d..b598c72f 100755
--- a/matrix_tests.sh
+++ b/matrix_tests.sh
@@ -3,11 +3,14 @@
 MASTER=1.7.0.preview2
 
 export ANDROID_TARGET RUBOTO_PLATFORM JRUBY_JARS_VERSION
+export SKIP_RUBOTO_UPDATE_TEST=1
 
 for ANDROID_TARGET in 10 15 ; do
   set +e
   killall emulator-arm
   sleep 5
+  killall -9 emulator-arm
+  sleep 1
   set -e
   if [ "$ANDROID_TARGET" == "15" ] ; then
     avd="Android_4.0.3"
@@ -17,7 +20,7 @@ for ANDROID_TARGET in 10 15 ; do
 
   emulator -avd $avd -no-snapshot-load -no-snapshot-save &
   adb wait-for-device
-  adb logcat > tmp/adb_logcat.txt &
+  adb logcat > adb_logcat.log &
 
   (
     set +e
@@ -35,7 +38,7 @@ for ANDROID_TARGET in 10 15 ; do
     exit 1
   ) &
 
-  for RUBOTO_PLATFORM in FROM_GEM STANDALONE CURRENT ; do  # CURRENT FROM_GEM STANDALONE
+  for RUBOTO_PLATFORM in CURRENT FROM_GEM STANDALONE ; do
     if [ "$RUBOTO_PLATFORM" == "STANDALONE" ] ; then
       jruby_versions="$MASTER 1.6.8 1.6.7.2"
     elif [ "$RUBOTO_PLATFORM" == "FROM_GEM" ] ; then
diff --git a/test/test_helper.rb b/test/test_helper.rb
index b47f2658..af6a69aa 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -250,7 +250,7 @@ def run_app_tests
       puts "Skipping instrumentation tests on #{ANDROID_OS} since they don't work."
       return
     end
-    check_platform_installation(Dir['libs/jruby-core-*.jar'].any?)
+    check_platform_installation
     Dir.chdir APP_DIR do
       # FIXME(uwe): Simplify when we stop supporting JRuby < 1.7.0 which causes the ArrayIndexOutOfBoundsException
       # FIXME(uwe): Simplify if we find a cause for the system crashes.
@@ -280,8 +280,8 @@ def run_app_tests
     end
   end
 
-  def check_platform_installation(standalone)
-    if standalone
+  def check_platform_installation
+    if RUBOTO_PLATFORM == 'STANDALONE'
       system 'rake platform:uninstall'
     elsif RUBOTO_PLATFORM == 'CURRENT'
       system "rake platform:current platform:install"