diff --git a/interface-definitions/system_option.xml.in b/interface-definitions/system_option.xml.in
index dc9958ff5a..064d9ff402 100644
--- a/interface-definitions/system_option.xml.in
+++ b/interface-definitions/system_option.xml.in
@@ -88,7 +88,7 @@
              <properties>
                <help>System keyboard layout, type ISO2</help>
                <completionHelp>
-                 <list>us uk fr de es fi jp106 no dk se-latin1 dvorak</list>
+                 <list>us uk fr de es fi it jp106 no dk se-latin1 dvorak</list>
                </completionHelp>
                <valueHelp>
                  <format>us</format>
@@ -114,6 +114,10 @@
                  <format>fi</format>
                  <description>Finland</description>
                </valueHelp>
+               <valueHelp>
+                <format>it</format>
+                <description>Italy</description>
+              </valueHelp>
                <valueHelp>
                  <format>jp106</format>
                  <description>Japan</description>
@@ -135,7 +139,7 @@
                  <description>Dvorak</description>
                </valueHelp>
                <constraint>
-                <regex>(us|uk|fr|de|es|fi|jp106|no|dk|se-latin1|dvorak)</regex>
+                <regex>(us|uk|fr|de|es|fi|it|jp106|no|dk|se-latin1|dvorak)</regex>
               </constraint>
               <constraintErrorMessage>Invalid keyboard layout</constraintErrorMessage>
              </properties>
diff --git a/smoketest/scripts/cli/test_system_option.py b/smoketest/scripts/cli/test_system_option.py
index ffb1d76aec..ed02806286 100755
--- a/smoketest/scripts/cli/test_system_option.py
+++ b/smoketest/scripts/cli/test_system_option.py
@@ -96,4 +96,4 @@ def test_ssh_client_options(self):
 
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2, failfast=True)
+    unittest.main(verbosity=2)