diff --git a/Android.mk b/Android.mk
index 35825e1..97bf41a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -134,7 +134,7 @@
 test-art-target-oat-process-am: $(TARGET_OUT_JAVA_LIBRARIES)/am.oat test-art-target-sync
 	adb remount
 	adb sync
-	adb shell sh -c "export CLASSPATH=/system/framework/am.jar && oat_processd /system/bin/app_process -Ximage:/system/framework/boot.art -Ximage:/system/framework/am.oat /system/bin com.android.commands.am.Am start http://android.com && touch /sdcard/test-art-target-process-am"
+	adb shell sh -c "export CLASSPATH=/system/framework/am.jar && oat_processd /system/bin/app_process -Ximage:/system/framework/boot.art -Ximage:/system/framework/am.art /system/bin com.android.commands.am.Am start http://android.com && touch /sdcard/test-art-target-process-am"
 	$(hide) (adb pull /sdcard/test-art-target-process-am /tmp/ && echo test-art-target-process-am PASSED) || echo test-art-target-process-am FAILED
 	$(hide) rm /tmp/test-art-target-process-am
 
@@ -158,7 +158,7 @@
 	  sleep 30; \
 	fi
 	adb shell kill `adb shell ps | fgrep com.android.calculator2 | sed -e 's/[^ ]* *\([0-9]*\).*/\1/'`
-	adb shell sh -c "export CLASSPATH=/system/framework/am.jar && oat_processd /system/bin/app_process -Ximage:/system/framework/boot.art -Ximage:/system/framework/am.oat /system/bin com.android.commands.am.Am start -a android.intent.action.MAIN -n com.android.calculator2/.Calculator && touch /sdcard/test-art-target-process-Calculator"
+	adb shell sh -c "export CLASSPATH=/system/framework/am.jar && oat_processd /system/bin/app_process -Ximage:/system/framework/boot.art -Ximage:/system/framework/am.art /system/bin com.android.commands.am.Am start -a android.intent.action.MAIN -n com.android.calculator2/.Calculator && touch /sdcard/test-art-target-process-Calculator"
 	$(hide) (adb pull /sdcard/test-art-target-process-Calculator /tmp/ && echo test-art-target-process-Calculator PASSED) || echo test-art-target-process-Calculator FAILED
 	$(hide) rm /tmp/test-art-target-process-Calculator
 
diff --git a/oat_process/app_main.cpp b/oat_process/app_main.cpp
index c5ec8e9..e769907 100644
--- a/oat_process/app_main.cpp
+++ b/oat_process/app_main.cpp
@@ -212,10 +212,10 @@
     // TODO: remove Calculator special case
     int oatArgc = argc + 2;
     const char* oatArgv[oatArgc];
-    if (strcmp(argv[0], "-Ximage:/system/framework/boot.oat") != 0) {
+    if (strcmp(argv[0], "-Ximage:/system/framework/boot.art") != 0) {
         LOG(INFO) << "Adding oat arguments";
-        oatArgv[0] = "-Ximage:/system/framework/boot.oat";
-        oatArgv[1] = "-Ximage:/system/app/Calculator.oat";
+        oatArgv[0] = "-Ximage:/system/framework/boot.art";
+        oatArgv[1] = "-Ximage:/system/app/Calculator.art";
         setenv("CLASSPATH", "/system/app/Calculator.apk", 1);
         memcpy(oatArgv + (oatArgc - argc), argv, argc * sizeof(*argv));
         argv = oatArgv;