diff --git a/gnucash/import-export/test/gtest-import-backend.cpp b/gnucash/import-export/test/gtest-import-backend.cpp
index eedcfba924..0f67ee9095 100644
--- a/gnucash/import-export/test/gtest-import-backend.cpp
+++ b/gnucash/import-export/test/gtest-import-backend.cpp
@@ -248,7 +248,7 @@ TEST_F(ImportBackendBayesTest, CreateTransInfo)
 
     // check tokens created from transaction
     EXPECT_CALL(imap, findAccountBayes(AllOf(
-            Each(Not(IsEmpty())),                // tokens must not be empty strings
+            Each(Not(StrEq(""))),                // tokens must not be empty strings
             Each(Not(HasSubstr(" "))),           // tokens must not contain separator
             Not(HasDuplicates()),                // tokens must be unique
             Contains(StrEq(local_day_of_week)),  // tokens must contain local day of week
diff --git a/libgnucash/engine/mocks/gmock-Account.cpp b/libgnucash/engine/mocks/gmock-Account.cpp
index 5152d88662..2e5f370606 100644
--- a/libgnucash/engine/mocks/gmock-Account.cpp
+++ b/libgnucash/engine/mocks/gmock-Account.cpp
@@ -85,7 +85,7 @@ gnc_account_imap_find_account_bayes (
         GList *tokens)
 {
     // \todo use std::list instead of std::vector, since GList is a double-linked list like std::list
-    std::vector<std::string> tokenVec;
+    std::vector<const char*> tokenVec;
 
     for (auto token = tokens; token; token = token->next)
     {
@@ -102,7 +102,7 @@ gnc_account_imap_add_account_bayes (
         Account *acc)
 {
     // \todo use std::list instead of std::vector, since GList is a double-linked list like std::list
-    std::vector<std::string> tokenVec;
+    std::vector<const char*> tokenVec;
 
     for (auto token = tokens; token; token = token->next)
     {
diff --git a/libgnucash/engine/mocks/gmock-Account.h b/libgnucash/engine/mocks/gmock-Account.h
index 2a39efe6fa..ee00366043 100644
--- a/libgnucash/engine/mocks/gmock-Account.h
+++ b/libgnucash/engine/mocks/gmock-Account.h
@@ -62,8 +62,8 @@ public:
 
     MOCK_METHOD2(findAccount, Account *(const char*, const char*));
     MOCK_METHOD3(addAccount, void(const char*, const char*, Account*));
-    MOCK_METHOD1(findAccountBayes, Account *(std::vector<std::string>));
-    MOCK_METHOD2(addAccountBayes, void(std::vector<std::string>, Account*));
+    MOCK_METHOD1(findAccountBayes, Account *(std::vector<const char*>));
+    MOCK_METHOD2(addAccountBayes, void(std::vector<const char*>, Account*));
 };
 
 #endif