diff --git a/test/sanity/nn/test_fused_batchnorm.py b/test/sanity/nn/test_fused_batchnorm.py
index af02f34bd..a76f364b0 100644
--- a/test/sanity/nn/test_fused_batchnorm.py
+++ b/test/sanity/nn/test_fused_batchnorm.py
@@ -19,7 +19,7 @@
 from tensorflow.python.ops import nn_impl
 from tensorflow.python.ops import nn_ops
 
-os.environ['ITEX_ENABLE_ONEDNN_LAYOUT_OPT']="0"
+os.environ['ITEX_LAYOUT_OPT']="0"
 
 class BatchNormalizationTest(test.TestCase):
   def _test_training_bwd(self,
diff --git a/test/sanity/quantization/native_quantized_concat_test.py b/test/sanity/quantization/native_quantized_concat_test.py
index 3c2186533..10fb1eb2c 100644
--- a/test/sanity/quantization/native_quantized_concat_test.py
+++ b/test/sanity/quantization/native_quantized_concat_test.py
@@ -19,7 +19,7 @@
 
 import tensorflow as tf
 
-os.environ["ITEX_ENABLE_ONEDNN_LAYOUT_OPT"] = "0"
+os.environ["ITEX_LAYOUT_OPT"] = "0"
 os.environ["ITEX_NATIVE_FORMAT"] = "1"
 
 class QuantizedConcat(test.TestCase):
diff --git a/test/sanity/quantization/native_quantized_fused_batch_norm_test.py b/test/sanity/quantization/native_quantized_fused_batch_norm_test.py
index 31f9bee2e..149390f18 100644
--- a/test/sanity/quantization/native_quantized_fused_batch_norm_test.py
+++ b/test/sanity/quantization/native_quantized_fused_batch_norm_test.py
@@ -20,7 +20,7 @@
 
 import tensorflow as tf
 
-os.environ["ITEX_ENABLE_ONEDNN_LAYOUT_OPT"] = "0"
+os.environ["ITEX_LAYOUT_OPT"] = "0"
 os.environ["ITEX_NATIVE_FORMAT"] = "1"
 
 class QuantizedFusedBatchNorm(test.TestCase):
diff --git a/test/tensorflow/python/kernel_tests/block_layout/quantized_maxpool_op_test.py b/test/tensorflow/python/kernel_tests/block_layout/quantized_maxpool_op_test.py
index 6357cfe0d..d275ea0a1 100644
--- a/test/tensorflow/python/kernel_tests/block_layout/quantized_maxpool_op_test.py
+++ b/test/tensorflow/python/kernel_tests/block_layout/quantized_maxpool_op_test.py
@@ -31,7 +31,7 @@
 from tensorflow.python.ops import nn_ops
 from tensorflow.python.ops.gen_nn_ops import quantized_max_pool
 
-os.environ["ITEX_ENABLE_ONEDNN_LAYOUT_OPT"] = "1"
+os.environ["ITEX_LAYOUT_OPT"] = "1"
 
 # TODO(itex): Test Quantize op in eager mode (non-block-layout pass),
 # when we support it
diff --git a/test/tensorflow/python/kernel_tests/conv_ops_3d_test.py b/test/tensorflow/python/kernel_tests/conv_ops_3d_test.py
index 257af3a86..5b5bc8f1d 100644
--- a/test/tensorflow/python/kernel_tests/conv_ops_3d_test.py
+++ b/test/tensorflow/python/kernel_tests/conv_ops_3d_test.py
@@ -40,7 +40,7 @@
 from tensorflow.python.eager import context
 
 # Test plain format
-os.environ['ITEX_ENABLE_ONEDNN_LAYOUT_OPT']="0"
+os.environ['ITEX_LAYOUT_OPT']="0"
 
 def GetTestConfigs():
   """Get all the valid tests configs to run.
diff --git a/test/tensorflow/python/kernel_tests/native_quantized_pooling_test.py b/test/tensorflow/python/kernel_tests/native_quantized_pooling_test.py
index 51e78e32c..2b9f57981 100644
--- a/test/tensorflow/python/kernel_tests/native_quantized_pooling_test.py
+++ b/test/tensorflow/python/kernel_tests/native_quantized_pooling_test.py
@@ -21,7 +21,7 @@
 
 import tensorflow as tf
 
-os.environ["ITEX_ENABLE_ONEDNN_LAYOUT_OPT"] = "0"
+os.environ["ITEX_LAYOUT_OPT"] = "0"
 os.environ["ITEX_NATIVE_FORMAT"] = "1"
 
 class QuantizedPoolingTest(test.TestCase):