diff --git a/plugins/Google.py b/plugins/GoogleTools.py
similarity index 99%
rename from plugins/Google.py
rename to plugins/GoogleTools.py
index c8648b1a1..dadab51ea 100644
--- a/plugins/Google.py
+++ b/plugins/GoogleTools.py
@@ -83,7 +83,7 @@ def configure(onStart, afterConnect, advanced):
 
 
 example = utils.wrapLines("""
-<jemfinch> @list google
+<jemfinch> @list googletools
 <supybot> google, googlefight, googleinfo, googlelicensekey, googlesite, googlespell, metagoogle
 <jemfinch> @google jemfinch
 <supybot> [Twisted-commits] Like, you know, a bugfix. jemfinch reported.: http://twistedmatrix.com/pipermail/twisted-commits/2002-August/002956.html :: Character Analysis of JemFinch NetEssays.NET - Thousands of FREE ...: http://www.netessays.net/viewpaper/1379.html :: SourceForge.net: Developer Profile: http://sourceforge.net/users/jemfinch/ (search took 0.174663 seconds)
@@ -114,7 +114,7 @@ def search(*args, **kwargs):
         last24hours.dequeue()
     return data
 
-class Google(callbacks.PrivmsgCommandAndRegexp):
+class GoogleTools(callbacks.PrivmsgCommandAndRegexp):
     threaded = True
     regexps = sets.Set(['googleSnarfer', 'googleGroups'])
     def __init__(self):
@@ -313,6 +313,7 @@ class Google(callbacks.PrivmsgCommandAndRegexp):
 
 
 
-Class = Google
+Class = GoogleTools
+
 
 # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/test/test_Google.py b/test/test_GoogleTools.py
similarity index 80%
rename from test/test_Google.py
rename to test/test_GoogleTools.py
index e8566386d..503b8925b 100644
--- a/test/test_Google.py
+++ b/test/test_GoogleTools.py
@@ -31,8 +31,13 @@
 
 from test import *
 
-class GoogleTestCase(PluginTestCase, PluginDocumentation):
-    plugins = ('Google',)
+class GoogleToolsTestCase(PluginTestCase, PluginDocumentation):
+    plugins = ('GoogleTools',)
+    def testGroupsSnarfer(self):
+        self.assertRegexp('http://groups.google.com/groups?dq=&hl=en&'
+                          'lr=lang_en&ie=UTF-8&oe=UTF-8&selm=698f09f8.'
+                          '0310132012.738e22fc%40posting.google.com',
+                          r'comp\.lang\.python.*question: usage of __slots__')
 
 
 # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: