diff --git a/unittest/gunit/field-t.cc b/unittest/gunit/field-t.cc
index 004f1c8..8dcbca8 100644
--- a/unittest/gunit/field-t.cc
+++ b/unittest/gunit/field-t.cc
@@ -400,8 +400,8 @@ TEST_F(FieldTest, CopyFieldSet)
   // Copy_field DTOR is not invoked in all contexts, so we may leak memory.
   EXPECT_FALSE(cf->tmp.is_alloced());
 
-  delete f_to->table;
-  delete f_from->table;
+  delete static_cast<Fake_TABLE *>(f_to->table);
+  delete static_cast<Fake_TABLE *>(f_from->table);
 }
 
 
diff --git a/unittest/gunit/mock_field_timestamp.h b/unittest/gunit/mock_field_timestamp.h
index 433215c..b7c2c01 100644
--- a/unittest/gunit/mock_field_timestamp.h
+++ b/unittest/gunit/mock_field_timestamp.h
@@ -81,7 +81,7 @@ public:
     store_timestamp_called= true;
   }
 
-  ~Mock_field_timestamp() { delete table; }
+  ~Mock_field_timestamp() { delete static_cast<Fake_TABLE *>(table); }
 };
 
 #endif // MOCK_FIELD_TIMESTAMP_H
diff --git a/unittest/gunit/mock_field_timestampf.h b/unittest/gunit/mock_field_timestampf.h
index 327a1df..5dff367 100644
--- a/unittest/gunit/mock_field_timestampf.h
+++ b/unittest/gunit/mock_field_timestampf.h
@@ -65,7 +65,7 @@ public:
     return Field_timestampf::store_timestamp_internal(tm);
   }
 
-  ~Mock_field_timestampf() { delete table; }
+  ~Mock_field_timestampf() { delete static_cast<Fake_TABLE *>(table); }
 };
 
 #endif // MOCK_FIELD_TIMESTAMPF_H