diff --git a/heat/cloudinit/loguserdata.py b/heat/cloudinit/loguserdata.py
index 0e36d23a2bf..7d0dbae461f 100755
--- a/heat/cloudinit/loguserdata.py
+++ b/heat/cloudinit/loguserdata.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/bin/bash
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
@@ -11,6 +11,14 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+"true" '''\'
+if hash python3 2>/dev/null; then
+    interpreter="python3"
+else
+    interpreter="python"
+fi
+exec $interpreter "$0"
+'''
 
 import datetime
 from distutils import version
diff --git a/heat_integrationtests/prepare_test_env.sh b/heat_integrationtests/prepare_test_env.sh
index 23a4a22b604..de1416b8339 100755
--- a/heat_integrationtests/prepare_test_env.sh
+++ b/heat_integrationtests/prepare_test_env.sh
@@ -31,7 +31,13 @@ nova flavor-create m1.heat_int 452 512 0 1
 nova flavor-create m1.heat_micro 453 128 0 1
 
 # Register the glance image for testing
-curl http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2 | glance image-create --name fedora-heat-test-image --disk-format qcow2 --container-format bare --visibility public
+curl -L https://download.fedoraproject.org/pub/fedora/linux/releases/24/CloudImages/x86_64/images/Fedora-Cloud-Base-24-1.2.x86_64.qcow2 | openstack image create fedora-heat-test-image --disk-format qcow2 --container-format bare --public
+if [[ ${PIPESTATUS[0]} -ne 0 ]]; then
+   # The curl command failed, so the upload is mostly likely incorrect. Let's
+   # bail out early.
+   exit 1
+fi
+
 iniset heat_integrationtests.conf DEFAULT image_ref fedora-heat-test-image
 iniset heat_integrationtests.conf DEFAULT boot_config_env $DEST/heat-templates/hot/software-config/boot-config/test_image_env.yaml
 iniset heat_integrationtests.conf DEFAULT heat_config_notify_script $DEST/heat-templates/hot/software-config/elements/heat-config/bin/heat-config-notify