diff --git a/saltlint/rules/YamlHasOctalValueRule.py b/saltlint/rules/YamlHasOctalValueRule.py
index b499b2d..7100a68 100644
--- a/saltlint/rules/YamlHasOctalValueRule.py
+++ b/saltlint/rules/YamlHasOctalValueRule.py
@@ -15,7 +15,7 @@ class YamlHasOctalValueRule(SaltLintRule):
     tags = ['formatting']
     version_added = 'v0.0.6'
 
-    bracket_regex = re.compile(r": (?<!['\"])0+[0-9]\d*(?!['\"])")
+    bracket_regex = re.compile(r"(?<=:)\s{0,}0[0-9]{1,}\s{0,}((?={#)|(?=#)|(?=$))")
 
     def match(self, file, line):
         return self.bracket_regex.search(line)
diff --git a/tests/unit/TestYamlHasOctalValueRule.py b/tests/unit/TestYamlHasOctalValueRule.py
index 9f2ee52..0921bf1 100644
--- a/tests/unit/TestYamlHasOctalValueRule.py
+++ b/tests/unit/TestYamlHasOctalValueRule.py
@@ -10,7 +10,7 @@
 from tests import RunFromText
 
 
-GOOD_NUMBER_LINE = '''
+GOOD_NUMBER_STATE = '''
 testdirectory:
   file.recurse:
     - name: /tmp/directory
@@ -22,18 +22,32 @@
     - name: /tmp/directory02
     - file_mode: 0
     - dir_mode: "0775"
+
+# Non-number values should be skipped, for more information see:
+# https://github.com/warpnet/salt-lint/issues/68
+apache_disable_default_site:
+  apache_site.disabled:
+    - name: 000-default
 '''
 
-BAD_NUMBER_LINE = '''
+BAD_NUMBER_STATE = '''
+# Unquoted octal values with leading zero's.
+testdirectory:
+  file.recurse:
+    - name: /tmp/directory
+    - file_mode: 00
+    - dir_mode: 0700
+
+# Unquoted octal values with leading zero's followed by a YAML of Jinja
+# comment.
 testdirectory:
   file.recurse:
-    - name: /tmp/directory001  # shouldn't fail
-    - mode: 0                  # shouldn't fail
-    - file_mode: 00            # should fail
-    - dir_mode: 0700           # should fail
+    - name: /tmp/directory
+    - file_mode: 00 # COMMENT
+    - dir_mode:0700{# JINJA COMMENT #}
 '''
 
-class TestFileModeLeadingZeroRule(unittest.TestCase):
+class TestYamlHasOctalValueRule(unittest.TestCase):
     collection = RulesCollection()
 
     def setUp(self):
@@ -41,10 +55,10 @@ def setUp(self):
 
     def test_statement_positive(self):
         runner = RunFromText(self.collection)
-        results = runner.run_state(GOOD_NUMBER_LINE)
+        results = runner.run_state(GOOD_NUMBER_STATE)
         self.assertEqual(0, len(results))
 
     def test_statement_negative(self):
         runner = RunFromText(self.collection)
-        results = runner.run_state(BAD_NUMBER_LINE)
-        self.assertEqual(2, len(results))
+        results = runner.run_state(BAD_NUMBER_STATE)
+        self.assertEqual(4, len(results))