diff --git a/src/hotspot/share/code/codeCache.cpp b/src/hotspot/share/code/codeCache.cpp
index 3a5da1d7cd2ae..b4bb2a093c425 100644
--- a/src/hotspot/share/code/codeCache.cpp
+++ b/src/hotspot/share/code/codeCache.cpp
@@ -268,7 +268,7 @@ void CodeCache::initialize_heaps() {
 
   // Validation
   // Check minimal required sizes
-  check_min_size("non-nmethod code heap", non_nmethod.size, non_nmethod_min_size);
+  check_min_size("non-nmethod code heap", non_nmethod.size, min_cache_size);
   if (profiled.enabled) {
     check_min_size("profiled code heap", profiled.size, min_size);
   }
diff --git a/test/hotspot/jtreg/compiler/codecache/CheckSegmentedCodeCache.java b/test/hotspot/jtreg/compiler/codecache/CheckSegmentedCodeCache.java
index 139ea6d76a275..c0cbc8e458be3 100644
--- a/test/hotspot/jtreg/compiler/codecache/CheckSegmentedCodeCache.java
+++ b/test/hotspot/jtreg/compiler/codecache/CheckSegmentedCodeCache.java
@@ -196,7 +196,7 @@ public static void main(String[] args) throws Exception {
                                                               "-XX:ReservedCodeCacheSize=" + minSize,
                                                               "-XX:InitialCodeCacheSize=100K",
                                                               "-version");
-        failsWith(pb, "Not enough space in non-nmethod code heap to run VM");
+        failsWith(pb, "Invalid code heap sizes");
 
         // Try different combination of Segment Sizes