diff --git a/Tests/RunCMake/set/Env-stdout-windows.txt b/Tests/RunCMake/set/Env-stdout-windows.txt
new file mode 100644
index 0000000000..3362ef3a41
--- /dev/null
+++ b/Tests/RunCMake/set/Env-stdout-windows.txt
@@ -0,0 +1,2 @@
+^-- ENV{UNSET_THEN_EMPTY} is not defined
+-- ENV{SET_THEN_EMPTY} is not defined$
diff --git a/Tests/RunCMake/set/Env-stdout.txt b/Tests/RunCMake/set/Env-stdout.txt
new file mode 100644
index 0000000000..d4ba82ea62
--- /dev/null
+++ b/Tests/RunCMake/set/Env-stdout.txt
@@ -0,0 +1,2 @@
+^-- ENV{UNSET_THEN_EMPTY} is not defined
+-- ENV{SET_THEN_EMPTY} is defined to ''$
diff --git a/Tests/RunCMake/set/Env.cmake b/Tests/RunCMake/set/Env.cmake
new file mode 100644
index 0000000000..dde637a430
--- /dev/null
+++ b/Tests/RunCMake/set/Env.cmake
@@ -0,0 +1,15 @@
+unset(ENV{UNSET_THEN_EMPTY})
+set(ENV{UNSET_THEN_EMPTY} "")
+if(DEFINED ENV{UNSET_THEN_EMPTY})
+  message(STATUS "ENV{UNSET_THEN_EMPTY} is defined to '$ENV{UNSET_THEN_EMPTY}'")
+else()
+  message(STATUS "ENV{UNSET_THEN_EMPTY} is not defined")
+endif()
+
+set(ENV{SET_THEN_EMPTY} "set")
+set(ENV{SET_THEN_EMPTY} "")
+if(DEFINED ENV{SET_THEN_EMPTY})
+  message(STATUS "ENV{SET_THEN_EMPTY} is defined to '$ENV{SET_THEN_EMPTY}'")
+else()
+  message(STATUS "ENV{SET_THEN_EMPTY} is not defined")
+endif()
diff --git a/Tests/RunCMake/set/RunCMakeTest.cmake b/Tests/RunCMake/set/RunCMakeTest.cmake
index 2ed4557205..1a65ba9311 100644
--- a/Tests/RunCMake/set/RunCMakeTest.cmake
+++ b/Tests/RunCMake/set/RunCMakeTest.cmake
@@ -12,3 +12,6 @@ run_cmake(CacheUnknownArguments)
 run_cmake(CacheMissingArguments)
 run_cmake(CacheWrongTYPE)
 run_cmake(CacheSetUnset)
+
+# set(ENV{}) syntax
+run_cmake_script(Env)