diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample
index f9fc1d5..3cbe1b5 100644
--- a/etc/tempest.conf.sample
+++ b/etc/tempest.conf.sample
@@ -209,13 +209,13 @@
 tenant_networks_reachable = false
 
 # Id of the public network that provides external connectivity.
-public_network_id = {$PUBLIC_NETWORK_UUID}
+public_network_id = {$PUBLIC_NETWORK_ID}
 
 # Id of a shared public router that provides external connectivity.
 # A shared public router would commonly be used where IP namespaces
 # were disabled.  If namespaces are enabled, it would be preferable
 # for each tenant to have their own router.
-public_router_id =
+public_router_id = {$PUBLIC_ROUTER_ID}
 
 [network-admin]
 # This section contains configuration options for an administrative
diff --git a/stress/test_floating_ips.py b/stress/test_floating_ips.py
index fcc5904..f23dca2 100755
--- a/stress/test_floating_ips.py
+++ b/stress/test_floating_ips.py
@@ -12,7 +12,6 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-import logging
 import random
 import telnetlib
 import time
diff --git a/tempest/tests/boto/test_s3_ec2_images.py b/tempest/tests/boto/test_s3_ec2_images.py
index 4990be6..f8f5027 100644
--- a/tempest/tests/boto/test_s3_ec2_images.py
+++ b/tempest/tests/boto/test_s3_ec2_images.py
@@ -16,7 +16,6 @@
 #    under the License.
 
 from contextlib import closing
-import logging
 import os
 
 from boto.s3.key import Key
diff --git a/tools/pip-requires b/tools/pip-requires
index 6542a3c..a0128e8 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -6,6 +6,6 @@
 boto>=2.2.1
 paramiko
 netaddr
-python-glanceclient>=0.5.0,<2
+python-glanceclient>=0.5.0
 python-keystoneclient>=0.2.0
-python-novaclient>=2.10.0,<3
+python-novaclient>=2.10.0