diff --git a/letsencrypt/tests/error_handler_test.py b/letsencrypt/tests/error_handler_test.py
index c92f12435..bf1ffbdad 100644
--- a/letsencrypt/tests/error_handler_test.py
+++ b/letsencrypt/tests/error_handler_test.py
@@ -13,7 +13,11 @@ class ErrorHandlerTest(unittest.TestCase):
         from letsencrypt import error_handler
 
         self.init_func = mock.MagicMock()
-        self.handler = error_handler.ErrorHandler(self.init_func)
+        self.init_args = {42}
+        self.init_kwargs = {'foo': 'bar'}
+        self.handler = error_handler.ErrorHandler(self.init_func,
+                                                  *self.init_args,
+                                                  **self.init_kwargs)
         # pylint: disable=protected-access
         self.signals = error_handler._SIGNALS
 
@@ -23,7 +27,8 @@ class ErrorHandlerTest(unittest.TestCase):
                 raise ValueError
         except ValueError:
             pass
-        self.init_func.assert_called_once_with()
+        self.init_func.assert_called_once_with(*self.init_args,
+                                               **self.init_kwargs)
 
     @mock.patch('letsencrypt.error_handler.os')
     @mock.patch('letsencrypt.error_handler.signal')
@@ -37,7 +42,8 @@ class ErrorHandlerTest(unittest.TestCase):
 
         signum = self.signals[0]
         signal_handler(signum, None)
-        self.init_func.assert_called_once_with()
+        self.init_func.assert_called_once_with(*self.init_args,
+                                               **self.init_kwargs)
         mock_os.kill.assert_called_once_with(mock_os.getpid(), signum)
 
         self.handler.reset_signal_handlers()
@@ -48,7 +54,8 @@ class ErrorHandlerTest(unittest.TestCase):
         bad_func = mock.MagicMock(side_effect=[ValueError])
         self.handler.register(bad_func)
         self.handler.call_registered()
-        self.init_func.assert_called_once_with()
+        self.init_func.assert_called_once_with(*self.init_args,
+                                               **self.init_kwargs)
         bad_func.assert_called_once_with()
 
     def test_sysexit_ignored(self):