diff --git a/Magento2/Sniffs/Html/HtmlBindingSniff.php b/Magento2/Sniffs/Html/HtmlBindingSniff.php
index 63718b5b..cf498da1 100644
--- a/Magento2/Sniffs/Html/HtmlBindingSniff.php
+++ b/Magento2/Sniffs/Html/HtmlBindingSniff.php
@@ -83,7 +83,7 @@ public function process(File $phpcsFile, $stackPtr)
                     . ' - "' . $htmlBinding . '" doesn\'t,' . PHP_EOL
                     . 'consider using text binding if the value is supposed to be text',
                     null,
-                    'UIComponentTemplate.KnockoutBinding.HtmlSuffix'
+                    'KnockoutBindingHtmlSuffix'
                 );
             }
         }
diff --git a/Magento2/Tests/Html/HtmlBindingSniffUnitTest.1.inc b/Magento2/Tests/Html/HtmlBindingSniffUnitTest.1.inc
new file mode 100644
index 00000000..37e71322
--- /dev/null
+++ b/Magento2/Tests/Html/HtmlBindingSniffUnitTest.1.inc
@@ -0,0 +1,30 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<div data-bind="attr: test.value"></div>
+<p>Test</p>
+<span data-bind="html: testError()"></span>
+<div data-bind="
+    attr : tst,
+    html: test.getSomething().value.error()
+"></div>
+<p data-bind="html: '<b>Some html</b>', attr: test"></p>
+<div data-bind="html: valueUnsanitizedHtml"></div>
+<div data-bind="attr: testhtml, html: valueUnsanitizedHtml()"></div>
+<p data-bind="other_html: bind, html: bind_stuff(1, 2)"></p>
+
+<div style="tst()"></div>
+<span html="testError()"></span>
+<div html="
+    test.getSomething().value.error(1)
+"></div>
+<p html="'<b>Some html</b>'"></p>
+<div html="valueUnsanitizedHtml"></div>
+<div html="
+valueUnsanitizedHtml('test')
+"></div>
+<p html="bind_stuff()"></p>
diff --git a/Magento2/Tests/Html/HtmlBindingUnitTest.php b/Magento2/Tests/Html/HtmlBindingUnitTest.php
new file mode 100644
index 00000000..fe033afd
--- /dev/null
+++ b/Magento2/Tests/Html/HtmlBindingUnitTest.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Html;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class HtmlBindingUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [1 => 6];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}