diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c
index 8ce4b936036..320bd04ac4e 100644
--- a/dlls/user32/tests/sysparams.c
+++ b/dlls/user32/tests/sysparams.c
@@ -2532,6 +2532,7 @@ static void test_EnumDisplaySettings(void)
     DEVMODE devmode;
     DWORD val;
     HDC hdc;
+    DWORD num;
 
     memset(&devmode, 0, sizeof(devmode));
     devmode.dmSize = sizeof(devmode);
@@ -2550,6 +2551,16 @@ static void test_EnumDisplaySettings(void)
     }
 
     ReleaseDC(0, hdc);
+
+    num = 1;
+    while (1) {
+	SetLastError (0xdeadbeef);
+	if (!EnumDisplaySettings(NULL, num++, &devmode)) {
+		DWORD le = GetLastError();
+		ok (le == ERROR_NO_MORE_FILES, "Last error on EnumDisplaySettings was %d, expected ERROR_NO_MORE_FILES\n", le);
+		break;
+	}
+    }
 }
 
 START_TEST(sysparams)
diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c
index 373562bce94..d68b674e531 100644
--- a/dlls/winex11.drv/settings.c
+++ b/dlls/winex11.drv/settings.c
@@ -316,6 +316,7 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW
         return TRUE;
     }
     TRACE("mode %d -- not present (%s)\n", n, handler_name);
+    SetLastError(ERROR_NO_MORE_FILES);
     return FALSE;
 }