diff --git a/tests/components/fan/__init__.py b/tests/components/fan/__init__.py
index 28ae7f4e249..e7cc83217ef 100644
--- a/tests/components/fan/__init__.py
+++ b/tests/components/fan/__init__.py
@@ -1,39 +1 @@
 """Tests for fan platforms."""
-
-import unittest
-
-from homeassistant.components.fan import FanEntity
-
-
-class BaseFan(FanEntity):
-    """Implementation of the abstract FanEntity."""
-
-    def __init__(self):
-        """Initialize the fan."""
-        pass
-
-
-class TestFanEntity(unittest.TestCase):
-    """Test coverage for base fan entity class."""
-
-    def setUp(self):
-        """Set up test data."""
-        self.fan = BaseFan()
-
-    def tearDown(self):
-        """Tear down unit test data."""
-        self.fan = None
-
-    def test_fanentity(self):
-        """Test fan entity methods."""
-        self.assertIsNone(self.fan.state)
-        self.assertEqual(0, len(self.fan.speed_list))
-        self.assertEqual(0, self.fan.supported_features)
-        self.assertEqual({}, self.fan.state_attributes)
-        # Test set_speed not required
-        self.fan.set_speed()
-        self.fan.oscillate()
-        with self.assertRaises(NotImplementedError):
-            self.fan.turn_on()
-        with self.assertRaises(NotImplementedError):
-            self.fan.turn_off()
diff --git a/tests/components/fan/test_init.py b/tests/components/fan/test_init.py
new file mode 100644
index 00000000000..15f9a79d2d2
--- /dev/null
+++ b/tests/components/fan/test_init.py
@@ -0,0 +1,40 @@
+"""Tests for fan platforms."""
+
+import unittest
+
+from homeassistant.components.fan import FanEntity
+
+
+class BaseFan(FanEntity):
+    """Implementation of the abstract FanEntity."""
+
+    def __init__(self):
+        """Initialize the fan."""
+        pass
+
+
+class TestFanEntity(unittest.TestCase):
+    """Test coverage for base fan entity class."""
+
+    def setUp(self):
+        """Set up test data."""
+        self.fan = BaseFan()
+
+    def tearDown(self):
+        """Tear down unit test data."""
+        self.fan = None
+
+    def test_fanentity(self):
+        """Test fan entity methods."""
+        self.assertEqual('on', self.fan.state)
+        self.assertEqual(0, len(self.fan.speed_list))
+        self.assertEqual(0, self.fan.supported_features)
+        self.assertEqual({'speed_list': []}, self.fan.state_attributes)
+        # Test set_speed not required
+        self.fan.oscillate(True)
+        with self.assertRaises(NotImplementedError):
+            self.fan.set_speed('slow')
+        with self.assertRaises(NotImplementedError):
+            self.fan.turn_on()
+        with self.assertRaises(NotImplementedError):
+            self.fan.turn_off()