diff --git a/tests/unit/utils/format_call_test.py b/tests/unit/utils/format_call_test.py
new file mode 100644
index 0000000000..7c5d2921bc
--- /dev/null
+++ b/tests/unit/utils/format_call_test.py
@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+'''
+    :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)`
+    :copyright: © 2013 by the SaltStack Team, see AUTHORS for more details.
+    :license: Apache 2.0, see LICENSE for more details.
+
+
+    tests.unit.utils.format_call_test
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Test `salt.utils.format_call`
+'''
+
+# Import Salt Testing libs
+from salttesting import TestCase
+from salttesting.helpers import ensure_in_syspath
+ensure_in_syspath('../../')
+
+# Import salt libs
+from salt.utils import format_call
+from salt.exceptions import SaltInvocationError
+
+
+class TestFormatCall(TestCase):
+    def test_simple_args_passing(self):
+        def foo(one, two=2, three=3):
+            pass
+
+        self.assertEqual(
+            format_call(foo, dict(one=10, two=20, three=30)),
+            {'args': [10], 'kwargs': dict(two=20, three=30)}
+        )
+        self.assertEqual(
+            format_call(foo, dict(one=10, two=20)),
+            {'args': [10], 'kwargs': dict(two=20, three=3)}
+        )
+        self.assertEqual(
+            format_call(foo, dict(one=2)),
+            {'args': [2], 'kwargs': dict(two=2, three=3)}
+        )
+
+    def test_mimic_typeerror_exceptions(self):
+        def foo(one, two=2, three=3):
+            pass
+        def foo2(one, two, three=3):
+            pass
+
+        with self.assertRaisesRegexp(
+                SaltInvocationError,
+                r'foo takes at least 1 argument \(0 given\)'):
+            format_call(foo, dict(two=3))
+
+        with self.assertRaisesRegexp(
+                TypeError,
+                r'foo2 takes at least 2 arguments \(1 given\)'):
+            format_call(foo2, dict(one=1))
+
+
+
+if __name__ == '__main__':
+    from integration import run_tests
+    run_tests(TestFormatCall, needs_daemon=False)