diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 65d99a7aa23..1362a4fcc29 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -4099,6 +4099,12 @@ jint Arguments::apply_ergo() {
       LogConfiguration::configure_stdout(LogLevel::Info, true, LOG_TAGS(valuebasedclasses));
     }
   }
+
+  if (!FLAG_IS_DEFAULT(UseBiasedLocking) && UseBiasedLocking) {
+    warning("Biased Locking is not supported with Lilliput build; ignoring UseBiasedLocking flag." );
+  }
+  UseBiasedLocking = false;
+
   return JNI_OK;
 }
 
diff --git a/test/hotspot/jtreg/runtime/logging/BiasedLockingTest.java b/test/hotspot/jtreg/runtime/logging/BiasedLockingTest.java
index df4486efbf7..5819a49ad93 100644
--- a/test/hotspot/jtreg/runtime/logging/BiasedLockingTest.java
+++ b/test/hotspot/jtreg/runtime/logging/BiasedLockingTest.java
@@ -37,7 +37,7 @@
 public class BiasedLockingTest {
     static void analyzeOutputOn(ProcessBuilder pb) throws Exception {
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
-        output.shouldContain("Biased locking enabled");
+        output.shouldContain("Biased Locking is not supported");
         output.shouldHaveExitValue(0);
     }