diff --git a/src/lib/client/Client.h b/src/lib/client/Client.h
index c3bdfaba..9245a825 100644
--- a/src/lib/client/Client.h
+++ b/src/lib/client/Client.h
@@ -62,10 +62,6 @@ public:
 							synergy::Screen* screen,
 							ClientArgs& args);
 	~Client();
-	
-#ifdef TEST_ENV
-	Client() : m_mock(true) { }
-#endif
 
 	//! @name manipulators
 	//@{
diff --git a/src/test/mock/client/MockClient.h b/src/test/mock/client/MockClient.h
deleted file mode 100644
index 427c9fe6..00000000
--- a/src/test/mock/client/MockClient.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2012 Synergy Si Ltd.
- * Copyright (C) 2011 Nick Bolton
- *
- * This package is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * found in the file COPYING that should have accompanied this file.
- *
- * This package is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define TEST_ENV
-
-#include "client/Client.h"
-
-#include "test/global/gmock.h"
-
-class IEventQueue;
-
-class MockClient : public Client
-{
-public:
-	MockClient() : Client() { }
-	MOCK_METHOD2(mouseMove, void(SInt32, SInt32));
-	MOCK_METHOD1(setOptions, void(const OptionsList&));
-	MOCK_METHOD0(handshakeComplete, void());
-	MOCK_METHOD1(setDecryptIv, void(const UInt8*));
-};