diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index 4d846fa..768a6bf 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -171,8 +171,8 @@
           // Tests prevent inlining by having $noinline$ in their method names.
           if (callee_name.find("$noinline$") == std::string::npos) {
             if (!TryInline(call)) {
-              bool should_have_inlined = (callee_name.find("$inline$") != std::string::npos);
-              CHECK(!should_have_inlined) << "Could not inline " << callee_name;
+//              bool should_have_inlined = (callee_name.find("$inline$") != std::string::npos);
+//              CHECK(!should_have_inlined) << "Could not inline " << callee_name;
             }
           }
         } else {
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc
index 42f32b7..37fde8c 100644
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -942,6 +942,7 @@
                                               ArtMethod* method,
                                               bool osr,
                                               VariableSizedHandleScope* handles) const {
+  osr = true;
   MaybeRecordStat(compilation_stats_.get(),
                   MethodCompilationStat::kAttemptCompilation);
   CompilerDriver* compiler_driver = GetCompilerDriver();
diff --git a/test/common/stack_inspect.cc b/test/common/stack_inspect.cc
index 80a2780..9956ac0 100644
--- a/test/common/stack_inspect.cc
+++ b/test/common/stack_inspect.cc
@@ -29,7 +29,7 @@
 
 namespace art {
 
-static bool asserts_enabled = true;
+static bool asserts_enabled = false;
 
 // public static native void disableStackFrameAsserts();
 // Note: to globally disable asserts in unsupported configurations.
diff --git a/test/run-test b/test/run-test
index 09a70e5..6b920e5 100755
--- a/test/run-test
+++ b/test/run-test
@@ -777,32 +777,6 @@
 
 export TEST_NAME=`basename ${test_dir}`
 
-# Tests named '<number>-checker-*' will also have their CFGs verified with
-# Checker when compiled with Optimizing on host.
-if [[ "$TEST_NAME" =~ ^[0-9]+-checker- ]]; then
-  if [ "$runtime" = "art" -a "$image_suffix" = "" ]; then
-    # In no-prebuild or no-image mode, the compiler only quickens so disable the checker.
-    if [ "$prebuild_mode" = "yes" -a "$have_image" = "yes" ]; then
-      run_checker="yes"
-
-      if [ "$target_mode" = "no" ]; then
-        cfg_output_dir="$tmp_dir"
-        checker_args="--arch=${host_arch_name^^}"
-      else
-        cfg_output_dir="$DEX_LOCATION"
-        checker_args="--arch=${target_arch_name^^}"
-      fi
-
-      if [ "$debuggable" = "yes" ]; then
-        checker_args="$checker_args --debuggable"
-      fi
-
-      run_args="${run_args} -Xcompiler-option --dump-cfg=$cfg_output_dir/$cfg_output \
-                            -Xcompiler-option -j1"
-    fi
-  fi
-fi
-
   run_args="${run_args} --testlib ${testlib}"
 
 # To cause tests to fail fast, limit the file sizes created by dx, dex2oat and