diff --git a/lib/rex/encoding/xor/byte.rb.ut.rb b/lib/rex/encoding/xor/byte.rb.ut.rb
index 23d2c10bca..7d15830b8a 100644
--- a/lib/rex/encoding/xor/byte.rb.ut.rb
+++ b/lib/rex/encoding/xor/byte.rb.ut.rb
@@ -16,12 +16,4 @@ class Rex::Encoding::Xor::Byte::UnitTest < Rex::Encoding::Xor::Generic::UnitTest
 	def enc
 		Rex::Encoding::Xor::Byte
 	end
-
-	def hook_static_encode(data, key, expected)
-		if key.length != enc.keysize
-			assert_raise(ArgumentError) { enc.encode(data, key) }
-		else
-			enc.encode(data, key)
-		end
-	end
 end
diff --git a/lib/rex/encoding/xor/generic.rb.ut.rb b/lib/rex/encoding/xor/generic.rb.ut.rb
index fa12646da5..02352c26de 100644
--- a/lib/rex/encoding/xor/generic.rb.ut.rb
+++ b/lib/rex/encoding/xor/generic.rb.ut.rb
@@ -11,6 +11,14 @@ class Rex::Encoding::Xor::Generic::UnitTest < Test::Unit::TestCase
 		Rex::Encoding::Xor::Generic
 	end
 
+	def hook_static_encode(data, key, expected)
+		if enc.keysize != 0 && key.length != enc.keysize
+			assert_raise(ArgumentError) { enc.encode(data,key) }
+		else
+			assert_equal(enc.encode(data, key), expected)
+		end
+	end
+
 	def test_static_encode
 		# Test key of zero length
 		assert_raise(ArgumentError) { enc.encode("\x00", "") }