diff --git a/libgnucash/engine/mocks/gmock-Account.cpp b/libgnucash/engine/mocks/gmock-Account.cpp
index 1b5f30a4aa..b4dd7d28fc 100644
--- a/libgnucash/engine/mocks/gmock-Account.cpp
+++ b/libgnucash/engine/mocks/gmock-Account.cpp
@@ -47,7 +47,7 @@ QofBook *
 gnc_account_get_book(const Account *account)
 {
     SCOPED_TRACE("");
-    const MockAccount* mockaccount = gnc_mockaccount(account);
+    auto mockaccount = gnc_mockaccount(account);
     return mockaccount ? mockaccount->get_book() : nullptr;
 }
 
@@ -56,7 +56,7 @@ xaccAccountForEachTransaction(const Account *acc, TransactionCallback proc,
                               void *data)
 {
     SCOPED_TRACE("");
-    const MockAccount* mockaccount = gnc_mockaccount(acc);
+    auto mockaccount = gnc_mockaccount(acc);
     return mockaccount ? mockaccount->for_each_transaction(proc, data) : 0;
 }
 
@@ -64,7 +64,7 @@ GncImportMatchMap *
 gnc_account_imap_create_imap (Account *acc)
 {
     SCOPED_TRACE("");
-    MockAccount* mockaccount = gnc_mockaccount(acc);
+    auto mockaccount = gnc_mockaccount(acc);
     return mockaccount ? mockaccount->create_imap() : nullptr;
 }
 
diff --git a/libgnucash/engine/mocks/gmock-Split.cpp b/libgnucash/engine/mocks/gmock-Split.cpp
index 1355f121da..de67a40f53 100644
--- a/libgnucash/engine/mocks/gmock-Split.cpp
+++ b/libgnucash/engine/mocks/gmock-Split.cpp
@@ -45,7 +45,7 @@ QofBook *
 xaccSplitGetBook (const Split *split)
 {
     SCOPED_TRACE("");
-    const MockSplit* mocksplit = gnc_mocksplit(split);
+    auto mocksplit = gnc_mocksplit(split);
     return mocksplit ? mocksplit->get_book() : nullptr;
 }
 
@@ -53,7 +53,7 @@ Account *
 xaccSplitGetAccount (const Split *split)
 {
     SCOPED_TRACE("");
-    const MockSplit* mocksplit = gnc_mocksplit(split);
+    auto mocksplit = gnc_mocksplit(split);
     return mocksplit ? mocksplit->get_account() : nullptr;
 }
 
@@ -69,7 +69,7 @@ gnc_numeric
 xaccSplitGetAmount (const Split *split)
 {
     SCOPED_TRACE("");
-    const MockSplit* mocksplit = gnc_mocksplit(split);
+    auto mocksplit = gnc_mocksplit(split);
     return mocksplit ? mocksplit->get_amount() : gnc_numeric_zero();
 }
 
@@ -84,7 +84,7 @@ gnc_numeric
 xaccSplitGetValue (const Split *split)
 {
     SCOPED_TRACE("");
-    const MockSplit* mocksplit = gnc_mocksplit(split);
+    auto mocksplit = gnc_mocksplit(split);
     return mocksplit ? mocksplit->get_value() : gnc_numeric_zero();
 }
 
@@ -99,7 +99,7 @@ const char *
 xaccSplitGetMemo (const Split *split)
 {
     SCOPED_TRACE("");
-    const MockSplit* mocksplit = gnc_mocksplit(split);
+    auto mocksplit = gnc_mocksplit(split);
     return mocksplit ? mocksplit->get_memo() : "";
 }
 
@@ -107,7 +107,7 @@ char
 xaccSplitGetReconcile (const Split *split)
 {
     SCOPED_TRACE("");
-    const MockSplit* mocksplit = gnc_mocksplit(split);
+    auto mocksplit = gnc_mocksplit(split);
     return mocksplit ? mocksplit->get_reconcile() : VREC;
 }
 
@@ -129,7 +129,7 @@ const char *
 xaccSplitGetAction (const Split *split)
 {
     SCOPED_TRACE("");
-    const MockSplit* mocksplit = gnc_mocksplit(split);
+    auto mocksplit = gnc_mocksplit(split);
     return mocksplit ? mocksplit->get_action() : "";
 }
 
@@ -137,7 +137,7 @@ Split *
 xaccSplitGetOtherSplit (const Split *split)
 {
     SCOPED_TRACE("");
-    const MockSplit* mocksplit = gnc_mocksplit(split);
+    auto mocksplit = gnc_mocksplit(split);
     return mocksplit ? mocksplit->get_other_split() : nullptr;
 }
 
@@ -145,7 +145,7 @@ Transaction *
 xaccSplitGetParent (const Split *split)
 {
     SCOPED_TRACE("");
-    const MockSplit* mocksplit = gnc_mocksplit(split);
+    auto mocksplit = gnc_mocksplit(split);
     return mocksplit ? mocksplit->get_parent() : nullptr;
 }
 
diff --git a/libgnucash/engine/mocks/gmock-Transaction.cpp b/libgnucash/engine/mocks/gmock-Transaction.cpp
index b185640b02..3bd1e65df8 100644
--- a/libgnucash/engine/mocks/gmock-Transaction.cpp
+++ b/libgnucash/engine/mocks/gmock-Transaction.cpp
@@ -49,7 +49,7 @@ Split *
 xaccTransGetSplit (const Transaction *trans, int i)
 {
     SCOPED_TRACE("");
-    const MockTransaction* mocktrans = gnc_mocktransaction(trans);
+    auto mocktrans = gnc_mocktransaction(trans);
     return mocktrans ? mocktrans->get_split(i) : nullptr;
 }
 
@@ -57,7 +57,7 @@ Split *
 xaccTransFindSplitByAccount(const Transaction *trans, const Account *acc)
 {
     SCOPED_TRACE("");
-    const MockTransaction* mocktrans = gnc_mocktransaction(trans);
+    auto mocktrans = gnc_mocktransaction(trans);
     EXPECT_TRUE(GNC_IS_ACCOUNT(acc));
     return mocktrans ? mocktrans->find_split_by_account(acc) : nullptr;
 }
@@ -66,7 +66,7 @@ time64
 xaccTransGetDate (const Transaction *trans)
 {
     SCOPED_TRACE("");
-    const MockTransaction* mocktrans = gnc_mocktransaction(trans);
+    auto mocktrans = gnc_mocktransaction(trans);
     return mocktrans ? mocktrans->get_date() : 0;
 }
 
@@ -81,7 +81,7 @@ const char *
 xaccTransGetDescription (const Transaction *trans)
 {
     SCOPED_TRACE("");
-    const MockTransaction* mocktrans = gnc_mocktransaction(trans);
+    auto mocktrans = gnc_mocktransaction(trans);
     return mocktrans ? mocktrans->get_description() : "";
 }
 
@@ -96,7 +96,7 @@ const char *
 xaccTransGetNotes (const Transaction *trans)
 {
     SCOPED_TRACE("");
-    const MockTransaction* mocktrans = gnc_mocktransaction(trans);
+    auto mocktrans = gnc_mocktransaction(trans);
     return mocktrans ? mocktrans->get_notes() : "";
 }
 
@@ -111,7 +111,7 @@ gnc_numeric
 xaccTransGetImbalanceValue (const Transaction * trans)
 {
     SCOPED_TRACE("");
-    const MockTransaction* mocktrans = gnc_mocktransaction(trans);
+    auto mocktrans = gnc_mocktransaction(trans);
     return mocktrans ? mocktrans->get_imbalance_value() : gnc_numeric_zero();
 }
 
@@ -119,7 +119,7 @@ const char *
 xaccTransGetNum (const Transaction *trans)
 {
     SCOPED_TRACE("");
-    const MockTransaction* mocktrans = gnc_mocktransaction(trans);
+    auto mocktrans = gnc_mocktransaction(trans);
     return mocktrans ? mocktrans->get_num() : "";
 }
 
@@ -127,7 +127,7 @@ gboolean
 xaccTransIsOpen (const Transaction *trans)
 {
     SCOPED_TRACE("");
-    const MockTransaction* mocktrans = gnc_mocktransaction(trans);
+    auto mocktrans = gnc_mocktransaction(trans);
     return mocktrans ? mocktrans->is_open() : FALSE;
 }
 
diff --git a/libgnucash/engine/mocks/gmock-qofbook.cpp b/libgnucash/engine/mocks/gmock-qofbook.cpp
index d2c389d9ac..1ea7d7215c 100644
--- a/libgnucash/engine/mocks/gmock-qofbook.cpp
+++ b/libgnucash/engine/mocks/gmock-qofbook.cpp
@@ -30,7 +30,7 @@ gboolean
 qof_book_use_split_action_for_num_field (const QofBook *book)
 {
     SCOPED_TRACE("");
-    const QofMockBook* mockbook = qof_mockbook(book);
+    auto mockbook = qof_mockbook(book);
     return mockbook ? mockbook->use_split_action_for_num_field() : FALSE;
 }