diff --git a/ChangeLog b/ChangeLog
index f5e08e3cf9..280bd35fa1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 16 17:15:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/dl/test_win32.rb (Win32API): enclosed by DL::TestWin32.
+	  [ruby-core:22827]
+
 Mon Mar 16 16:37:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/tk/tcltklib.c (eventloop_sleep, lib_eventloop_core),
diff --git a/test/dl/test_win32.rb b/test/dl/test_win32.rb
index b40e3690d8..32beb2703f 100644
--- a/test/dl/test_win32.rb
+++ b/test/dl/test_win32.rb
@@ -2,6 +2,7 @@ require 'test_base'
 require 'dl/import'
 require 'dl/types'
 
+class DL::TestWin32 < DL::TestBase
 module Win32API
   extend DL::Importer
 
@@ -36,8 +37,7 @@ module Win32API
 rescue DL::DLError
 end
 
-module DL
-class TestWin32 < TestBase
+if defined?(Win32API::OSVERSIONINFO)
   def test_version()
     platform = Win32API.get_version_ex().dwPlatformId
     case ENV['OS']
@@ -51,4 +51,4 @@ class TestWin32 < TestBase
     assert_equal(expect, platform)
   end
 end
-end if defined?(Win32API::OSVERSIONINFO)
+end