diff --git a/src/lib/charm/openstack/softhsm.py b/src/lib/charm/openstack/softhsm.py
index bd96f35..8ba6fb8 100644
--- a/src/lib/charm/openstack/softhsm.py
+++ b/src/lib/charm/openstack/softhsm.py
@@ -188,7 +188,7 @@ def read_pins_from_store():
         pin = o['pin']
         so_pin = o['so_pin']
         return pin, so_pin
-    except:
+    except Exception:
         return None, None
 
 
diff --git a/src/tests/gate-basic-xenial-pike b/src/tests/gate-basic-xenial-pike
old mode 100644
new mode 100755
diff --git a/src/tox.ini b/src/tox.ini
index 3bc4d0b..c744c8f 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -35,7 +35,7 @@ commands =
 # Run a specific test as an Amulet smoke test (expected to always pass)
 basepython = python2.7
 commands =
-    bundletester -vl DEBUG -r json -o func-results.json gate-basic-xenial-mitaka --no-destroy
+    bundletester -vl DEBUG -r json -o func-results.json gate-basic-xenial-pike --no-destroy
 
 [testenv:func27-dfs]
 # Run all deploy-from-source tests which are +x (may not always pass!)