diff --git a/cmake/CMakeLists_test.txt b/cmake/CMakeLists_test.txt
index 02de488e..7b09633f 100644
--- a/cmake/CMakeLists_test.txt
+++ b/cmake/CMakeLists_test.txt
@@ -29,10 +29,16 @@ if(WIN32)
 	)
 endif()
 
-if(APPLE)
-	list(APPEND integtests
-		${root_dir}/src/integtest/platform/COSXClipboardTests.cpp
-	)
+if(UNIX)
+	if(APPLE)
+		list(APPEND integtests
+			    ${root_dir}/src/integtest/platform/COSXClipboardTests.cpp
+		)
+	else()
+		list(APPEND integtests
+			    ${root_dir}/src/integtest/platform/CXWindowsClipboardTests.cpp
+		)
+	endif()
 endif()
 
 set(inc
diff --git a/src/integtest/platform/CXWindowsClipboardTests.cpp b/src/integtest/platform/CXWindowsClipboardTests.cpp
new file mode 100644
index 00000000..c37e46ee
--- /dev/null
+++ b/src/integtest/platform/CXWindowsClipboardTests.cpp
@@ -0,0 +1,153 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * 
+ * 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/>.
+ */
+
+#include <iostream>
+#include <gtest/gtest.h>
+#include "CXWindowsClipboard.h"
+
+class CXWindowsClipboardTests : public ::testing::Test
+{
+protected:
+	virtual void
+	SetUp()
+	{
+		m_display = XOpenDisplay(NULL);
+		int screen = DefaultScreen(m_display);
+		Window root = XRootWindow(m_display, screen);
+		
+		XSetWindowAttributes attr;
+		attr.do_not_propagate_mask = 0;
+		attr.override_redirect = True;
+		attr.cursor = Cursor();
+		
+		m_window = XCreateWindow(
+			m_display, root, 0, 0, 1, 1, 0, 0,
+			InputOnly, CopyFromParent,
+			CWDontPropagate | CWEventMask |
+			CWOverrideRedirect | CWCursor,
+			&attr);
+	}
+
+	virtual void
+	TearDown()
+	{
+		XDestroyWindow(m_display, m_window);
+		XCloseDisplay(m_display);
+	}
+
+	CXWindowsClipboard&
+	createClipboard()
+	{
+		CXWindowsClipboard* clipboard;
+		clipboard = new CXWindowsClipboard(m_display, m_window, 0);
+		clipboard->open(0); // needed to empty the clipboard
+		clipboard->empty(); // needed to own the clipboard
+		return *clipboard;
+	}
+
+	Display* m_display;
+	Window m_window;
+};
+
+TEST_F(CXWindowsClipboardTests, empty_openCalled_returnsTrue)
+{
+	CXWindowsClipboard clipboard = createClipboard();
+	
+	bool actual = clipboard.empty();
+	
+	EXPECT_EQ(true, actual);
+}
+
+TEST_F(CXWindowsClipboardTests, empty_singleFormat_hasReturnsFalse)
+{
+	CXWindowsClipboard clipboard = createClipboard();
+	clipboard.add(CXWindowsClipboard::kText, "synergy rocks!");
+	
+	clipboard.empty();
+	
+	bool actual = clipboard.has(CXWindowsClipboard::kText);
+	EXPECT_EQ(false, actual);
+}
+
+TEST_F(CXWindowsClipboardTests, add_newValue_valueWasStored)
+{
+	CXWindowsClipboard clipboard = createClipboard();
+	
+	clipboard.add(IClipboard::kText, "synergy rocks!");
+	
+	CString actual = clipboard.get(IClipboard::kText);
+	EXPECT_EQ("synergy rocks!", actual);
+}
+
+TEST_F(CXWindowsClipboardTests, add_replaceValue_valueWasReplaced)
+{
+	CXWindowsClipboard clipboard = createClipboard();
+	
+	clipboard.add(IClipboard::kText, "synergy rocks!");
+	clipboard.add(IClipboard::kText, "maxivista sucks"); // haha, just kidding.
+	
+	CString actual = clipboard.get(IClipboard::kText);
+	EXPECT_EQ("maxivista sucks", actual);
+}
+
+TEST_F(CXWindowsClipboardTests, close_isOpen_noErrors)
+{
+	CXWindowsClipboard clipboard = createClipboard();
+	
+	// clipboard opened in createClipboard()
+	clipboard.close();
+	
+	// can't assert anything
+}
+
+TEST_F(CXWindowsClipboardTests, has_withFormatAdded_returnsTrue)
+{
+	CXWindowsClipboard clipboard = createClipboard();
+	clipboard.add(IClipboard::kText, "synergy rocks!");
+	
+	bool actual = clipboard.has(IClipboard::kText);
+	
+	EXPECT_EQ(true, actual);
+}
+
+TEST_F(CXWindowsClipboardTests, has_withNoFormats_returnsFalse)
+{
+	CXWindowsClipboard clipboard = createClipboard();
+	
+	bool actual = clipboard.has(IClipboard::kText);
+	
+	EXPECT_EQ(false, actual);
+}
+
+TEST_F(CXWindowsClipboardTests, get_withNoFormats_returnsEmpty)
+{
+	CXWindowsClipboard clipboard = createClipboard();
+	
+	CString actual = clipboard.get(IClipboard::kText);
+	
+	EXPECT_EQ("", actual);
+}
+
+TEST_F(CXWindowsClipboardTests, get_withFormatAdded_returnsExpected)
+{
+	CXWindowsClipboard clipboard = createClipboard();
+	clipboard.add(IClipboard::kText, "synergy rocks!");
+	
+	CString actual = clipboard.get(IClipboard::kText);
+	
+	EXPECT_EQ("synergy rocks!", actual);
+}