diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt
index ba40b6ad..61fc0253 100644
--- a/src/test/integtests/CMakeLists.txt
+++ b/src/test/integtests/CMakeLists.txt
@@ -17,28 +17,11 @@
 file(GLOB_RECURSE headers "*.h")
 file(GLOB_RECURSE sources "*.cpp")
 
-# remove arch files (specific arch added later).
-file(GLOB remove_arch "arch/*")
-list(REMOVE_ITEM headers ${remove_arch})
-list(REMOVE_ITEM sources ${remove_arch})
-
 # remove platform files (specific platform added later).
-file(GLOB remove_platform "platform/*")
+file(GLOB_RECURSE remove_platform "platform/*")
 list(REMOVE_ITEM headers ${remove_platform})
 list(REMOVE_ITEM sources ${remove_platform})
 
-# arch
-if (WIN32)
-	file(GLOB arch_sources "arch/ArchWindows*.cpp")
-	file(GLOB arch_headers "arch/ArchWindows*.h")
-elseif (UNIX)
-	file(GLOB arch_sources "arch/ArchUnix*.cpp")
-	file(GLOB arch_headers "arch/ArchUnix*.h")
-endif()
-
-list(APPEND sources ${arch_sources})
-list(APPEND headers ${arch_headers})
-
 # platform
 if (WIN32)
 	file(GLOB platform_sources "platform/MSWindows*.cpp")
diff --git a/src/test/integtests/arch/ArchInternetUnixTests.cpp b/src/test/integtests/arch/ArchInternetTests.cpp
similarity index 89%
rename from src/test/integtests/arch/ArchInternetUnixTests.cpp
rename to src/test/integtests/arch/ArchInternetTests.cpp
index b30adb22..ee2aa27a 100644
--- a/src/test/integtests/arch/ArchInternetUnixTests.cpp
+++ b/src/test/integtests/arch/ArchInternetTests.cpp
@@ -15,16 +15,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "arch/ArchInternetUnix.h"
+#include "arch/Arch.h"
 
 #include "test/global/gtest.h"
 
 #define TEST_URL "https://synergy-foss.org/tests/?testString"
 //#define TEST_URL "http://localhost/synergy/tests/?testString"
 
-TEST(CArchInternetWindowsTests, openWebPage)
+TEST(ArchInternetTests, get)
 {
-	CArchInternetUnix internet;
+	ARCH_INTERNET internet;
 	CString result = internet.get(TEST_URL);
 	ASSERT_EQ("Hello world!", result);
 }
diff --git a/src/test/integtests/arch/ArchInternetWindowsTests.cpp b/src/test/integtests/arch/ArchInternetWindowsTests.cpp
deleted file mode 100644
index bf3a5a81..00000000
--- a/src/test/integtests/arch/ArchInternetWindowsTests.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2014 Bolton Software Ltd.
- *
- * 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 "arch/ArchInternetWindows.h"
-
-#include "test/global/gtest.h"
-
-#define TEST_URL "https://synergy-foss.org/tests/?testString"
-//#define TEST_URL "http://localhost/synergy/tests/?testString"
-
-TEST(CArchInternetWindowsTests, openWebPage)
-{
-	CArchInternetWindows internet;
-	CString result = internet.get(TEST_URL);
-	ASSERT_EQ("Hello world!", result);
-}