diff --git a/.gitignore b/.gitignore
index 49779f1e7..23a391b0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,7 +62,7 @@ tests/gamma
 tests/glfwinfo
 tests/iconify
 tests/joysticks
-tests/modes
+tests/monitors
 tests/peter
 tests/reopen
 tests/sharing
diff --git a/docs/monitor.dox b/docs/monitor.dox
index 8a5c5d90f..51b9a9f57 100644
--- a/docs/monitor.dox
+++ b/docs/monitor.dox
@@ -31,7 +31,7 @@ video mode, describes the viewports that the connected monitors provide into the
 virtual desktop that spans them.
 
 To see how GLFW views your monitor setup and its available video modes, run the
-`modes` test program.
+`monitors` test program.
 
 
 @subsection monitor_monitors Retrieving monitors
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1f4422210..5ec68f389 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -28,7 +28,7 @@ add_executable(gamma gamma.c ${GETOPT})
 add_executable(glfwinfo glfwinfo.c ${GETOPT})
 add_executable(iconify iconify.c ${GETOPT})
 add_executable(joysticks joysticks.c)
-add_executable(modes modes.c ${GETOPT})
+add_executable(monitors monitors.c ${GETOPT})
 add_executable(peter peter.c)
 add_executable(reopen reopen.c)
 add_executable(cursor cursor.c)
@@ -62,7 +62,7 @@ target_link_libraries(threads "${CMAKE_THREAD_LIBS_INIT}" "${RT_LIBRARY}")
 
 set(WINDOWS_BINARIES accuracy empty sharing tearing threads title windows cursoranim)
 set(CONSOLE_BINARIES clipboard defaults events fsaa gamma glfwinfo
-                     iconify joysticks modes peter reopen cursor)
+                     iconify joysticks monitors peter reopen cursor)
 
 set_target_properties(${WINDOWS_BINARIES} ${CONSOLE_BINARIES} PROPERTIES
                       FOLDER "GLFW3/Tests")
diff --git a/tests/modes.c b/tests/monitors.c
similarity index 97%
rename from tests/modes.c
rename to tests/monitors.c
index 58067e3ea..47f12faf7 100644
--- a/tests/modes.c
+++ b/tests/monitors.c
@@ -1,5 +1,5 @@
 //========================================================================
-// Video mode test
+// Monitor information tool
 // Copyright (c) Camilla Berglund <elmindreda@elmindreda.org>
 //
 // This software is provided 'as-is', without any express or implied
@@ -23,7 +23,8 @@
 //
 //========================================================================
 //
-// This test enumerates or verifies video modes
+// This test prints monitor and video mode information or verifies video
+// modes
 //
 //========================================================================
 
@@ -43,8 +44,8 @@ enum Mode
 
 static void usage(void)
 {
-    printf("Usage: modes [-t]\n");
-    printf("       modes -h\n");
+    printf("Usage: monitors [-t]\n");
+    printf("       monitors -h\n");
 }
 
 static const char* format_mode(const GLFWvidmode* mode)