diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e2b608e4e8cb254e49a958c61ec3f05913d2633..379fb67f3bec157c53535f115785790aeda9fbd9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -500,7 +500,7 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
   FOREACH(test
       testSystemTools
       testIOS
-      testhash
+      testHashSTL
       testCommandLineArguments
       )
     ADD_EXECUTABLE(${test} ${test}.cxx)
@@ -533,6 +533,6 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
     ADD_TEST(kwsys-testProcess-5 ${EXEC_DIR}/testProcess 5)
     ADD_TEST(kwsys-testProcess-6 ${EXEC_DIR}/testProcess 6)
     ADD_TEST(kwsys-testProcess-7 ${EXEC_DIR}/testProcess 7)
-    ADD_TEST(kwsys-testhash ${EXEC_DIR}/testhash)
+    ADD_TEST(kwsys-testHashSTL ${EXEC_DIR}/testHashSTL)
   ENDIF(BUILD_TESTING)
 ENDIF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
diff --git a/testhash.cxx b/testhash.cxx
deleted file mode 100644
index 8c303664bfb1d634bad315e70816ed0997b492e4..0000000000000000000000000000000000000000
--- a/testhash.cxx
+++ /dev/null
@@ -1,77 +0,0 @@
-/*=========================================================================
-
-  Program:   KWSys - Kitware System Library
-  Module:    testhash.cxx
-
-  Copyright (c) Kitware, Inc., Insight Consortium.  All rights reserved.
-  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
-
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-
-=========================================================================*/
-#include "kwsysPrivate.h"
-#include KWSYS_HEADER(hash_map.hxx)
-#include KWSYS_HEADER(hash_set.hxx)
-#include KWSYS_HEADER(ios/iostream)
-
-// Work-around CMake dependency scanning limitation.  This must
-// duplicate the above list of headers.
-#if 0
-# include "hash_map.hxx.in"
-# include "hash_set.hxx.in"
-# include "hashtable.hxx.in"
-# include "kwsys_ios_iostream.h.in"
-#endif
-
-#if defined(_MSC_VER)
-# pragma warning (disable:4786)
-#endif
-
-#if defined(__sgi) && !defined(__GNUC__)
-# pragma set woff 1468 /* inline function cannot be explicitly instantiated */
-#endif
-
-template class kwsys::hash_map<const char*, int>;
-template class kwsys::hash_set<int>;
-
-bool test_hash_map()
-{
-  typedef kwsys::hash_map<const char*, int> mtype;
-  mtype m;
-  const char* keys[] = {"hello", "world"};
-  m[keys[0]] = 1;
-  m.insert(mtype::value_type(keys[1], 2));
-  int sum = 0;
-  for(mtype::iterator mi = m.begin(); mi != m.end(); ++mi)
-    {
-    kwsys_ios::cout << "Found entry [" << mi->first << "," << mi->second << "]"
-                    << kwsys_ios::endl;
-    sum += mi->second;
-    }
-  return sum == 3;
-}
-
-bool test_hash_set()
-{
-  typedef kwsys::hash_set<int> stype;
-  stype s;
-  s.insert(1);
-  s.insert(2);
-  int sum = 0;
-  for(stype::iterator si = s.begin(); si != s.end(); ++si)
-    {
-    kwsys_ios::cout << "Found entry [" << *si << "]" << kwsys_ios::endl;
-    sum += *si;
-    }
-  return sum == 3;
-}
-
-int main()
-{
-  bool result = true;
-  result = test_hash_map() && result;
-  result = test_hash_set() && result;
-  return result? 0:1;
-}