diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py
index 8a5f6602a80..d53b916ecb8 100644
--- a/Lib/test/test_set.py
+++ b/Lib/test/test_set.py
@@ -1,3 +1,4 @@
+
 import unittest
 from test import test_support
 import gc
@@ -48,6 +49,7 @@ class TestJointOps(unittest.TestCase):
 
     def test_new_or_init(self):
         self.assertRaises(TypeError, self.thetype, [], 2)
+        self.assertRaises(TypeError, set().__init__, a=1)
 
     def test_uniquification(self):
         actual = sorted(self.s)
diff --git a/Objects/setobject.c b/Objects/setobject.c
index af5d576b98d..47362eb6adc 100644
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -1987,6 +1987,8 @@ set_init(PySetObject *self, PyObject *args, PyObject *kwds)
 
 	if (!PyAnySet_Check(self))
 		return -1;
+	if (PySet_Check(self) && !_PyArg_NoKeywords("set()", kwds))
+		return -1;
 	if (!PyArg_UnpackTuple(args, Py_TYPE(self)->tp_name, 0, 1, &iterable))
 		return -1;
 	set_clear_internal(self);