diff --git a/src/flag-definitions.h b/src/flag-definitions.h
index 358d67e472..654c32271b 100644
--- a/src/flag-definitions.h
+++ b/src/flag-definitions.h
@@ -287,8 +287,9 @@ DEFINE_bool(lazy_sweeping, true,
             "Use lazy sweeping for old pointer and data spaces")
 DEFINE_bool(cleanup_caches_in_maps_at_gc, true,
             "Flush code caches in maps during mark compact cycle.")
-DEFINE_bool(never_compact, false,
+DEFINE_bool(never_compact, true,
             "Never perform compaction on full GC - testing only")
+DEFINE_bool(compact_code_space, true, "Compact code space")
 DEFINE_bool(cleanup_code_caches_at_gc, true,
             "Flush inline caches prior to mark compact collection and "
             "flush code caches in maps during mark compact cycle.")
diff --git a/src/mark-compact.cc b/src/mark-compact.cc
index 54a293685f..e5178ecbfe 100644
--- a/src/mark-compact.cc
+++ b/src/mark-compact.cc
@@ -244,7 +244,10 @@ bool MarkCompactCollector::StartCompaction() {
 
     CollectEvacuationCandidates(heap()->old_pointer_space());
     CollectEvacuationCandidates(heap()->old_data_space());
-    CollectEvacuationCandidates(heap()->code_space());
+
+    if (FLAG_compact_code_space) {
+      CollectEvacuationCandidates(heap()->code_space());
+    }
 
     heap()->old_pointer_space()->EvictEvacuationCandidatesFromFreeLists();
     heap()->old_data_space()->EvictEvacuationCandidatesFromFreeLists();