diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2a915405..40a2bb01 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -15,22 +15,24 @@ if(APPLE)
   add_executable(Accuracy MACOSX_BUNDLE accuracy.c)
   add_executable(FSAA MACOSX_BUNDLE fsaa.c)
   add_executable(Tearing MACOSX_BUNDLE tearing.c)
+  add_executable(Windows MACOSX_BUNDLE windows.c)
 else()
   # Set boring names for executables
   add_executable(accuracy WIN32 accuracy.c)
   add_executable(tearing WIN32 tearing.c)
   add_executable(fsaa WIN32 fsaa.c)
+  add_executable(windows WIN32 windows.c)
 endif(APPLE)
 
 if(MSVC)
   # Tell MSVC to use main instead of WinMain for Windows subsystem executables
-  set_target_properties(accuracy defaults events fsaa peter reopen tearing version PROPERTIES LINK_FLAGS "/ENTRY:mainCRTStartup")
+  set_target_properties(accuracy defaults events fsaa peter reopen tearing version windows PROPERTIES LINK_FLAGS "/ENTRY:mainCRTStartup")
 endif(MSVC)
 
 if(CYGWIN)
   # Set cross-compile and subsystem compile and link flags
-  set_target_properties(accuracy defaults events fsaa joysticks peter reopen tearing version PROPERTIES COMPILE_FLAGS "-mno-cygwin")
-  set_target_properties(accuracy fsaa tearing PROPERTIES LINK_FLAGS "-mno-cygwin -mwindows")
+  set_target_properties(accuracy defaults events fsaa joysticks peter reopen tearing version windows PROPERTIES COMPILE_FLAGS "-mno-cygwin")
+  set_target_properties(accuracy fsaa tearing windows PROPERTIES LINK_FLAGS "-mno-cygwin -mwindows")
   set_target_properties(events defaults joysticks peter reopen version PROPERTIES LINK_FLAGS "-mno-cygwin -mconsole")
 endif(CYGWIN)
 
diff --git a/tests/windows.c b/tests/windows.c
new file mode 100644
index 00000000..66494004
--- /dev/null
+++ b/tests/windows.c
@@ -0,0 +1,97 @@
+//========================================================================
+// Simple multi-window test
+// Copyright (c) Camilla Berglund <elmindreda@elmindreda.org>
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//    claim that you wrote the original software. If you use this software
+//    in a product, an acknowledgment in the product documentation would
+//    be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not
+//    be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+//    distribution.
+//
+//========================================================================
+//
+// This test creates four windows and clears each in a different color
+//
+//========================================================================
+
+#include <GL/glfw.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+static GLFWwindow open_window(int width, int height, const char* title)
+{
+    GLFWwindow window = glfwOpenWindow(width, height, GLFW_WINDOW);
+    if (!window)
+    {
+        fprintf(stderr, "Failed to open GLFW default window\n");
+        return NULL;
+    }
+
+    glfwSetWindowTitle(window, title);
+
+    return window;
+}
+
+int main(void)
+{
+    int i;
+    GLboolean running = GL_TRUE;
+    GLFWwindow windows[4];
+
+    if (!glfwInit())
+    {
+        fprintf(stderr, "Failed to initialize GLFW\n");
+        exit(1);
+    }
+
+    for (i = 0;  i < 4;  i++)
+    {
+        windows[i] = open_window(200, 200, "Foo");
+        if (!windows[i])
+        {
+            glfwTerminate();
+            exit(EXIT_FAILURE);
+        }
+
+        glClearColor((i & 0x01) ? 1.0 : 0.0,
+                        (i & 0x02) ? 1.0 : 0.0,
+                        0.0,
+                        0.0);
+    }
+
+    while (running)
+    {
+        for (i = 0;  i < 4;  i++)
+        {
+            glfwMakeWindowCurrent(windows[i]);
+            glClear(GL_COLOR_BUFFER_BIT);
+            glfwSwapBuffers();
+        }
+
+        glfwPollEvents();
+
+        for (i = 0;  i < 4;  i++)
+        {
+            if (!glfwIsWindow(windows[i]))
+                running = GL_FALSE;
+        }
+    }
+
+    glfwTerminate();
+    exit(EXIT_SUCCESS);
+}
+