diff --git a/oelint_adv/__main__.py b/oelint_adv/__main__.py
index 71b95477..336b4603 100644
--- a/oelint_adv/__main__.py
+++ b/oelint_adv/__main__.py
@@ -115,7 +115,7 @@ def create_argparser() -> argparse.ArgumentParser:
                         help='Print loaded rules as a rulefile and exit')
     parser.add_argument('--exit-zero', action='store_true', default=False,
                         help='Always return a 0 (non-error) status code, even if lint errors are found')
-    parser.add_argument('--release', default=list(Tweaks._map.keys())[-1], choices=Tweaks._map.keys(),
+    parser.add_argument('--release', default='nanbield', choices=Tweaks._map.keys(),
                         help='Run against a specific Yocto release')
     # Override the defaults with the values from the config file
     parser.set_defaults(**parse_configfile())
diff --git a/tests/test_class_oelint_var_inherit.py b/tests/test_class_oelint_var_inherit.py
index 86442431..ba55a495 100644
--- a/tests/test_class_oelint_var_inherit.py
+++ b/tests/test_class_oelint_var_inherit.py
@@ -28,7 +28,7 @@ class TestClassOelintVarInherit(TestBaseClass):
                              ],
                              )
     def test_bad_inherit(self, input_, id_, occurrence):
-        self.check_for_id(self._create_args(input_), id_, occurrence)
+        self.check_for_id(self._create_args(input_, ['--release=scarthgap']), id_, occurrence)
 
     @pytest.mark.parametrize('id_', ['oelint.var.inherit.inherit'])
     @pytest.mark.parametrize('occurrence', [1])
@@ -41,7 +41,7 @@ def test_bad_inherit(self, input_, id_, occurrence):
                              ],
                              )
     def test_bad_inherit_defer(self, input_, id_, occurrence):
-        self.check_for_id(self._create_args(input_), id_, occurrence)
+        self.check_for_id(self._create_args(input_, ['--release=scarthgap']), id_, occurrence)
 
     @pytest.mark.parametrize('id_', ['oelint.var.inherit.inherit'])
     @pytest.mark.parametrize('occurrence', [0])
@@ -56,7 +56,7 @@ def test_bad_inherit_defer(self, input_, id_, occurrence):
                              ],
                              )
     def test_good_inherit(self, input_, id_, occurrence):
-        self.check_for_id(self._create_args(input_), id_, occurrence)
+        self.check_for_id(self._create_args(input_, ['--release=scarthgap']), id_, occurrence)
 
     @pytest.mark.parametrize('id_', ['oelint.var.inherit.inherit_defer'])
     @pytest.mark.parametrize('occurrence', [0])
@@ -83,4 +83,4 @@ def test_good_inherit(self, input_, id_, occurrence):
                              ],
                              )
     def test_good_inherit_defer(self, input_, id_, occurrence):
-        self.check_for_id(self._create_args(input_), id_, occurrence)
+        self.check_for_id(self._create_args(input_, ['--release=scarthgap']), id_, occurrence)