diff --git a/setup/so-functions b/setup/so-functions
index 9b65c9f0e..88da7ee9e 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1646,6 +1646,12 @@ reserve_ports() {
 	fi
 }
 
+clear_previous_setup_results() {
+	# Disregard previous setup outcomes.
+	rm -f /root/failure
+	rm -f /root/success
+}
+
 reinstall_init() {
 	info "Putting system in state to run setup again"
 
@@ -1657,10 +1663,6 @@ reinstall_init() {
 
 	local service_retry_count=20
 
-	# Disregard previous install outcomes
-	rm -f /root/failure
-	rm -f /root/success
-
 	{
 		# remove all of root's cronjobs
 		logCmd "crontab -r -u root"
diff --git a/setup/so-setup b/setup/so-setup
index ab055fd2d..bdb1c38e2 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -132,6 +132,10 @@ if [[ -f /root/accept_changes ]]; then
 	reset_proxy
 fi
 
+# Previous setup attempts, even if setup doesn't actually start the installation,
+# can leave behind results that may interfere with the current setup attempt.
+clear_previous_setup_results
+
 title "Parsing Username for Install"
 parse_install_username