diff --git a/homeassistant/components/timer.py b/homeassistant/components/timer/__init__.py
similarity index 98%
rename from homeassistant/components/timer.py
rename to homeassistant/components/timer/__init__.py
index 4d21cca40bb..b2f5db88b5f 100644
--- a/homeassistant/components/timer.py
+++ b/homeassistant/components/timer/__init__.py
@@ -166,8 +166,8 @@ def async_setup(hass, config):
             yield from asyncio.wait(tasks, loop=hass.loop)
 
     descriptions = yield from hass.async_add_job(
-        load_yaml_config_file, os.path.join(
-            os.path.dirname(__file__), os.path.join(DOMAIN, 'services.yaml'))
+        load_yaml_config_file,
+        os.path.join(os.path.dirname(__file__), 'services.yaml')
     )
 
     hass.services.async_register(
diff --git a/tests/components/timer/__init__.py b/tests/components/timer/__init__.py
new file mode 100644
index 00000000000..160fc633701
--- /dev/null
+++ b/tests/components/timer/__init__.py
@@ -0,0 +1 @@
+"""Test env for timer component."""
diff --git a/tests/components/test_timer.py b/tests/components/timer/test_init.py
similarity index 100%
rename from tests/components/test_timer.py
rename to tests/components/timer/test_init.py