diff --git a/neutron_vpnaas/tests/api/base.py b/neutron_vpnaas/tests/api/base.py
index 75c0d2445..2a523791b 100644
--- a/neutron_vpnaas/tests/api/base.py
+++ b/neutron_vpnaas/tests/api/base.py
@@ -1,5 +1,5 @@
 # Copyright 2012 OpenStack Foundation
-# Copyright 2016 Hewlett Packard Enterprise Development Company
+# Copyright 2016 Hewlett Packard Enterprise Development Company LP
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -16,9 +16,9 @@
 
 import netaddr
 from oslo_log import log as logging
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions as lib_exc
 
 from neutron.tests.tempest import config
 
@@ -62,16 +62,16 @@ class BaseNetworkTest(test.BaseTestCase):
     def get_client_manager(cls, credential_type=None, roles=None,
                            force_new=None):
         manager = test.BaseTestCase.get_client_manager(
-                credential_type=credential_type,
-                roles=roles,
-                force_new=force_new)
+            credential_type=credential_type,
+            roles=roles,
+            force_new=force_new)
         # Neutron uses a different clients manager than the one in the Tempest
         return clients.Manager(manager.credentials)
 
     @classmethod
     def skip_checks(cls):
         super(BaseNetworkTest, cls).skip_checks()
-        # Create no network resources for these test.
+        # Create no network resources for these tests.
         if not CONF.service_available.neutron:
             raise cls.skipException("Neutron support is required")
         if cls._ip_version == 6 and not CONF.network_feature_enabled.ipv6:
@@ -112,7 +112,7 @@ class BaseNetworkTest(test.BaseTestCase):
                                          vpnservice['id'])
 
     @classmethod
-    def _try_delete_resource(self, delete_callable, *args, **kwargs):
+    def _try_delete_resource(cls, delete_callable, *args, **kwargs):
         """Cleanup resources in case of test-failure
 
         Some resources are explicitly deleted by the test.
diff --git a/neutron_vpnaas/tests/api/test_vpnaas.py b/neutron_vpnaas/tests/api/test_vpnaas.py
index 006d111a5..43f3d3f1d 100644
--- a/neutron_vpnaas/tests/api/test_vpnaas.py
+++ b/neutron_vpnaas/tests/api/test_vpnaas.py
@@ -14,9 +14,9 @@
 #    under the License.
 
 import six
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions as lib_exc
 from tempest import test
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions as lib_exc
 
 from neutron.tests.tempest import config
 
diff --git a/tools/tox_install.sh b/tools/tox_install.sh
index 552ba3595..ed6d7fc3a 100755
--- a/tools/tox_install.sh
+++ b/tools/tox_install.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Many of neutron's repos suffer from the problem of depending on neutron,
 # but it not existing on pypi.