diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index a0f7acdc..9db47381 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -358,8 +358,8 @@ endif(X11_FOUND)
 
 # test binary names
 if (WIN32)
-	set (EXT ".exe")
-	# compatible with Automake .in files
+	# Automake calls this EXEEXT, and CMake doesn't have a standard name
+	# for it; follow Automake's naming convention so we can share .in files
 	set (EXEEXT ".exe")
 endif(WIN32)
 
diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
index 263a18f8..8657e4c7 100644
--- a/cmake/test/CMakeLists.txt
+++ b/cmake/test/CMakeLists.txt
@@ -54,7 +54,7 @@ target_link_libraries(test-names dbus-testutils)
 
 add_executable(shell-test ${shell-test_SOURCES})
 target_link_libraries(shell-test ${DBUS_INTERNAL_LIBRARIES})
-ADD_TEST(shell-test ${EXECUTABLE_OUTPUT_PATH}/shell-test${EXT})
+ADD_TEST(shell-test ${EXECUTABLE_OUTPUT_PATH}/shell-test${EXEEXT})
 
 add_executable(test-shell-service ${test-shell-service_SOURCES})
 target_link_libraries(test-shell-service dbus-testutils)