diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb
index 12a63438d..cc5359862 100644
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -3422,4 +3422,9 @@ class IssueTest < ActiveSupport::TestCase
     r = Issue.like('as_f')
     assert_include issue, r
   end
+
+  def test_like_should_tokenize
+    r = Issue.like('issue today')
+    assert_include Issue.find(7), r
+  end
 end
diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb
index 767cf36ba..632335a91 100644
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -2826,4 +2826,11 @@ class QueryTest < ActiveSupport::TestCase
     query.add_filter('subject', '~', ['te_t'])
     assert_equal 1, query.issue_count
   end
+
+  def test_sql_contains_should_tokenize
+    query = IssueQuery.new(:project => nil, :name => '_')
+    query.add_filter('subject', '~', ['issue today'])
+
+    assert_equal 1, query.issue_count
+  end
 end