diff --git a/tests/unit/beacons/test_status.py b/tests/unit/beacons/test_status.py
new file mode 100644
index 0000000000..e0d5e587aa
--- /dev/null
+++ b/tests/unit/beacons/test_status.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+'''
+    :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)`
+    :copyright: © 2017 by the SaltStack Team, see AUTHORS for more details.
+
+
+    tests.unit.beacons.test_status
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Status beacon test cases
+'''
+
+# Python libs
+from __future__ import absolute_import
+
+# Salt libs
+import salt.config
+import salt.loader
+from salt.beacons import status
+from salt.modules import status as status_module
+
+# Salt testing libs
+from tests.support.unit import TestCase
+from tests.support.mixins import LoaderModuleMockMixin
+
+
+class StatusBeaconTestCase(TestCase, LoaderModuleMockMixin):
+    '''
+    Test case for salt.beacons.status
+    '''
+    loader_module = (status, status_module)
+
+    def loader_module_globals(self):
+        opts = salt.config.DEFAULT_MINION_OPTS
+        return {
+            '__opts__': opts,
+            '__salt__': 'autoload',
+            '__context__': {},
+            '__grains__': {'kernel': 'Linux'}
+        }
+
+    def test_empty_config(self, *args, **kwargs):
+        config = {}
+        ret = status.beacon(config)
+        self.assertEqual(ret[0]['data'].keys(), ['loadavg', 'meminfo', 'cpustats', 'vmstats', 'time'])
+
+    def test_deprecated_dict_config(self):
+        config = {'time': ['all']}
+        ret = status.beacon(config)
+        self.assertEqual(ret[0]['data'].keys(), ['time'])
+
+    def test_list_config(self):
+        config = [{'time': ['all']}]
+        ret = status.beacon(config)
+        self.assertEqual(ret[0]['data'].keys(), ['time'])