diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
old mode 100644
new mode 100755
index 867ba3a4..60abd707
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -5,6 +5,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../include ${OPENGL_INCLUDE_DIR}
 
 add_executable(defaults defaults.c)
 add_executable(events events.c)
+add_executable(fsfocus fsfocus.c)
 add_executable(iconify iconify.c getopt.c)
 add_executable(joysticks joysticks.c)
 add_executable(peter peter.c)
@@ -27,13 +28,13 @@ endif(APPLE)
 
 if(MSVC)
   # Tell MSVC to use main instead of WinMain for Windows subsystem executables
-  set_target_properties(accuracy defaults events iconify joysticks fsaa peter reopen tearing version windows PROPERTIES LINK_FLAGS "/ENTRY:mainCRTStartup")
+  set_target_properties(accuracy defaults events fsfocus iconify joysticks 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 iconify joysticks peter reopen tearing version windows PROPERTIES COMPILE_FLAGS "-mno-cygwin")
+  set_target_properties(accuracy defaults events fsaa fsfocus iconify 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 iconify joysticks peter reopen version PROPERTIES LINK_FLAGS "-mno-cygwin -mconsole")
+  set_target_properties(events defaults fsfocus iconify joysticks peter reopen version PROPERTIES LINK_FLAGS "-mno-cygwin -mconsole")
 endif(CYGWIN)
 
diff --git a/tests/fsfocus.c b/tests/fsfocus.c
new file mode 100755
index 00000000..bdbbb310
--- /dev/null
+++ b/tests/fsfocus.c
@@ -0,0 +1,110 @@
+//========================================================================
+// Fullscreen window (un)focus 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 is used to test window activation and iconfication for
+// fullscreen windows with a video mode differing from the desktop mode
+//
+//========================================================================
+
+#include <GL/glfw3.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+static GLboolean running = GL_TRUE;
+
+static void window_focus_callback(GLFWwindow window, int activated)
+{
+    printf("%0.3f: Window %s\n",
+           glfwGetTime(),
+           activated ? "activated" : "deactivated");
+}
+
+static void window_key_callback(GLFWwindow window, int key, int action)
+{
+    if (action != GLFW_PRESS)
+        return;
+
+    switch (key)
+    {
+        case GLFW_KEY_ESC:
+        {
+            printf("%0.3f: User pressed Escape\n", glfwGetTime());
+            running = GL_FALSE;
+            break;
+        }
+
+        case GLFW_KEY_SPACE:
+        {
+            printf("%0.3f: User pressed Space\n", glfwGetTime());
+            glfwIconifyWindow(window);
+            break;
+        }
+    }
+}
+
+static int window_close_callback(GLFWwindow window)
+{
+    printf("%0.3f: User closed window\n", glfwGetTime());
+    return GL_TRUE;
+}
+
+int main(void)
+{
+    GLFWwindow window;
+
+    if (!glfwInit())
+    {
+        fprintf(stderr, "Failed to initialize GLFW: %s\n", glfwErrorString(glfwGetError()));
+        exit(EXIT_FAILURE);
+    }
+
+    window = glfwOpenWindow(640, 480, GLFW_FULLSCREEN, "Fullscreen focus");
+    if (!window)
+    {
+        glfwTerminate();
+
+        fprintf(stderr, "Failed to open GLFW window: %s\n", glfwErrorString(glfwGetError()));
+        exit(EXIT_FAILURE);
+    }
+
+    glfwSwapInterval(1);
+    glfwEnable(window, GLFW_MOUSE_CURSOR);
+
+    glfwSetWindowFocusCallback(window, window_focus_callback);
+    glfwSetKeyCallback(window, window_key_callback);
+    glfwSetWindowCloseCallback(window, window_close_callback);
+
+    while (running && glfwIsWindow(window) == GL_TRUE)
+    {
+        glClear(GL_COLOR_BUFFER_BIT);
+        glfwSwapBuffers();
+        glfwWaitEvents();
+    }
+
+    glfwTerminate();
+    exit(EXIT_SUCCESS);
+}
+