diff --git a/test/fdct4x4_test.cc b/test/fdct4x4_test.cc
index 3538c7bd9..9dcc0785d 100644
--- a/test/fdct4x4_test.cc
+++ b/test/fdct4x4_test.cc
@@ -44,10 +44,8 @@ void iht4x4_add(int16_t* /*in*/, int16_t *out, uint8_t *dst,
 
 class FwdTrans4x4Test : public ::testing::TestWithParam<int> {
  public:
-  FwdTrans4x4Test() { SetUpTestTxfm(); }
-  ~FwdTrans4x4Test() {}
-
-  void SetUpTestTxfm() {
+  virtual ~FwdTrans4x4Test() {}
+  virtual void SetUp() {
     tx_type_ = GetParam();
     if (tx_type_ == 0) {
       fwd_txfm_ = fdct4x4;
diff --git a/test/fdct8x8_test.cc b/test/fdct8x8_test.cc
index eeae208f2..50e2e9d4d 100644
--- a/test/fdct8x8_test.cc
+++ b/test/fdct8x8_test.cc
@@ -51,10 +51,8 @@ void iht8x8_add(int16_t* /*in*/, int16_t *out, uint8_t *dst,
 
 class FwdTrans8x8Test : public ::testing::TestWithParam<int> {
  public:
-  FwdTrans8x8Test() { SetUpTestTxfm(); }
-  ~FwdTrans8x8Test() {}
-
-  void SetUpTestTxfm() {
+  virtual ~FwdTrans8x8Test() {}
+  virtual void SetUp() {
     tx_type_ = GetParam();
     if (tx_type_ == 0) {
       fwd_txfm = fdct8x8;