diff --git a/GaudiExamples/tests/scripts/python_bin_module.py b/GaudiExamples/tests/scripts/python_bin_module.py
index 8af6f3273a840fb7afe24e158de475cfba378c0e..1dc627ed7836b0901ae6b21b1dea10ca426e66ae 100755
--- a/GaudiExamples/tests/scripts/python_bin_module.py
+++ b/GaudiExamples/tests/scripts/python_bin_module.py
@@ -29,7 +29,7 @@ class TestCase(unittest.TestCase):
 
     def test_010_Function(self):
         import PyExample
-        self.assertEquals(PyExample.greet(), "hello, world")
+        self.assertEqual(PyExample.greet(), "hello, world")
 
 
 if __name__ == '__main__':
diff --git a/GaudiKernel/python/GaudiKernel/Configurable.py b/GaudiKernel/python/GaudiKernel/Configurable.py
index 1d32bab93a30d5ffbd203b734367c3c4c0d0070c..7c7dbb0f3c876cc2419730d2be3b8c49e95025db 100644
--- a/GaudiKernel/python/GaudiKernel/Configurable.py
+++ b/GaudiKernel/python/GaudiKernel/Configurable.py
@@ -1567,8 +1567,11 @@ def applyConfigurableUsers():
         # easiest way to fix bug #103803.
         # <https://savannah.cern.ch/bugs/?103803>
         while True:
-            yield next(c for c in Configurable.allConfigurables.values()
-                       if c.isApplicable())
+            try:
+                yield next(c for c in Configurable.allConfigurables.values()
+                           if c.isApplicable())
+            except StopIteration:
+                break
 
     debugApplyOrder = 'GAUDI_DUBUG_CONF_USER' in os.environ
     for c in applicableConfUsers():