diff --git a/slackclient/_channel.py b/slackclient/_channel.py
index ca1ede355..cc642c1d3 100644
--- a/slackclient/_channel.py
+++ b/slackclient/_channel.py
@@ -6,7 +6,7 @@ def __init__(self, server, name, channel_id, members=None):
         self.members = [] if members is None else members
 
     def __eq__(self, compare_str):
-        if self.name == compare_str or self.name == "#" + compare_str or self.id == compare_str:
+        if self.name == compare_str or "#" + self.name == compare_str or self.id == compare_str:
             return True
         else:
             return False
diff --git a/tests/test_channel.py b/tests/test_channel.py
index b00926800..544577ea9 100644
--- a/tests/test_channel.py
+++ b/tests/test_channel.py
@@ -2,10 +2,20 @@
 import pytest
 
 
-def test_Channel(channel):
+def test_channel(channel):
     assert type(channel) == Channel
 
+def test_channel_eq(channel):
+    channel = Channel(
+        'test-server',
+        'test-channel',
+        'C12345678',
+    )
+    assert channel == 'test-channel'
+    assert channel == '#test-channel'
+    assert channel == 'C12345678'
+    assert (channel == 'foo') is False
 
 @pytest.mark.xfail
-def test_Channel_send_message(channel):
+def test_channel_send_message(channel):
     channel.send_message('hi')