diff --git a/run_tests.sh b/run_tests.sh
index 90ff30a26..87fd42026 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -102,7 +102,8 @@ set +e
 if [ "${MANAGE_REPOS}" = true ]; then
 print_header 'Install repos'
 $SUDO $PUPPET_FULL_PATH apply $PUPPET_ARGS -e "include ::openstack_integration::repos"
- if [ $? -ne 2 ]; then
+ RESULT=$?
+ if [ $RESULT -ne 0 ] && [ $RESULT -ne 2 ]; then
 print_header 'Puppet failed to install repositories.'
 exit 1
 fi
@@ -112,7 +113,7 @@ print_header "Running Puppet Scenario: ${SCENARIO} (1st time)"
 run_puppet $SCENARIO
 RESULT=$?
 set -e
-if [ $RESULT -ne 2 ]; then
+if [ $RESULT -ne 0 ] && [ $RESULT -ne 2 ]; then
 print_header 'First Puppet run contains errors in catalog.'
 print_header 'SELinux Alerts (1st time)'
 catch_selinux_alerts
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/puppet-openstack-integration/commit/d029bb4d95973ffc5db43f21e8e5e2749f3130ca.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/puppet-openstack-integration/commit/d029bb4d95973ffc5db43f21e8e5e2749f3130ca.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>