diff --git a/plugins/Format.py b/plugins/Format.py
index e873630ad..948d14777 100644
--- a/plugins/Format.py
+++ b/plugins/Format.py
@@ -96,7 +96,7 @@ class Format(callbacks.Privmsg):
         Joins all the arguments together with <separator>.
         """
         irc.reply(sep.join(args))
-    join = wrap(join, ['something'], allowExtra=True)
+    join = wrap(join, ['anything'], allowExtra=True)
 
     def translate(self, irc, msg, args, bad, good, text):
         """<chars to translate> <chars to replace those with> <text>
diff --git a/test/test_BadWords.py b/test/test_BadWords.py
index 597283a4e..d22c5d6cb 100644
--- a/test/test_BadWords.py
+++ b/test/test_BadWords.py
@@ -43,14 +43,14 @@ class BadWordsTestCase(PluginTestCase):
             self.assertRegexp('echo %s' % word, '(?!%s)' % word)
             self.assertRegexp('echo [colorize %s]' % word, '(?!%s)' % word)
             self.assertRegexp('echo foo%sbar' % word, '(?!%s)' % word)
-            self.assertRegexp('echo [join "" %s]' % ' '.join(word),
+            self.assertRegexp('echo [format join "" %s]' % ' '.join(word),
                               '(?!%s)' % word)
 
     def _NegTest(self):
         for word in self.badwords:
             self.assertRegexp('echo %s' % word, word)
             self.assertRegexp('echo foo%sbar' % word, word)
-            self.assertRegexp('echo [join "" %s]' % ' '.join(word), word)
+            self.assertRegexp('echo [format join "" %s]' % ' '.join(word),word)
 
     def testAddbadwords(self):
         self.assertNotError('badwords add %s' % ' '.join(self.badwords))
diff --git a/test/test_Format.py b/test/test_Format.py
index 8d707c4a6..6a3f80840 100644
--- a/test/test_Format.py
+++ b/test/test_Format.py
@@ -50,6 +50,7 @@ class UtilitiesTestCase(PluginTestCase):
         
     def testJoin(self):
         self.assertResponse('join + foo bar baz', 'foo+bar+baz')
+        self.assertResponse('join "" foo bar baz', 'foobarbaz')
 
     def testTranslate(self):
         self.assertResponse('translate 123 456 1234567890', '4564567890')