diff --git a/test/ClientTest.cpp b/test/ClientTest.cpp
index 0ff6370a..bc957fb9 100644
--- a/test/ClientTest.cpp
+++ b/test/ClientTest.cpp
@@ -88,12 +88,11 @@ TEST_F(ClientTest, AccountTag) {
 
     CMessage msg(":nick!user@host PRIVMSG #channel :text");
     CMessage extmsg("@account=account-name :nick!user@host PRIVMSG #channel :text");
-    EXPECT_FALSE(m_pTestClient->HasAccountTag());
+    EXPECT_FALSE(m_pTestClient->IsTagEnabled("account"));
     m_pTestClient->PutClient(extmsg);
     EXPECT_THAT(m_pTestClient->vsLines, ElementsAre(msg.ToString()));
-    m_pTestClient->SetAccountTag(true);
     m_pTestClient->SetTagSupport("account", true);
-    EXPECT_TRUE(m_pTestClient->HasAccountTag());
+    EXPECT_TRUE(m_pTestClient->IsTagEnabled("account"));
     m_pTestClient->PutClient(extmsg);
     EXPECT_THAT(m_pTestClient->vsLines,
                 ElementsAre(msg.ToString(), extmsg.ToString()));
diff --git a/test/IRCTest.h b/test/IRCTest.h
index 928aa798..7e8f178e 100644
--- a/test/IRCTest.h
+++ b/test/IRCTest.h
@@ -36,7 +36,6 @@ class TestClient : public CClient {
     }
     void Reset() { vsLines.clear(); }
     void SetAccountNotify(bool bEnabled) { m_bAccountNotify = bEnabled; }
-    void SetAccountTag(bool bEnabled) { m_bAccountTag = bEnabled; }
     void SetAwayNotify(bool bEnabled) { m_bAwayNotify = bEnabled; }
     void SetExtendedJoin(bool bEnabled) { m_bExtendedJoin = bEnabled; }
     void SetNamesx(bool bEnabled) { m_bNamesx = bEnabled; }