diff --git a/nova/testing/runner.py b/nova/testing/runner.py
index 794fa384..39e8d7d8 100644
--- a/nova/testing/runner.py
+++ b/nova/testing/runner.py
@@ -107,7 +107,7 @@ class _AnsiColorizer(object):
                 except curses.error:
                     curses.setupterm()
                     return curses.tigetnum("colors") > 2
-            except:
+            except Exception:
                 raise
                 # guess false in case of error
                 return False
diff --git a/nova/vsa/api.py b/nova/vsa/api.py
index 18cf1370..7635b51c 100644
--- a/nova/vsa/api.py
+++ b/nova/vsa/api.py
@@ -253,7 +253,7 @@ class API(base.Base):
                                     volume_type=vol_type,
                                     metadata=dict(to_vsa_id=str(vsa_id)),
                                     availability_zone=availability_zone)
-                except:
+                except Exception:
                     self.update_vsa_status(context, vsa_id,
                                            status=VsaState.PARTIAL)
                     raise