diff --git a/app/models/location.rb b/app/models/location.rb
index 46cb1da6c..ab6298b37 100644
--- a/app/models/location.rb
+++ b/app/models/location.rb
@@ -373,14 +373,19 @@ class Location < ApplicationRecord
     startdate || [created_at, FormHandler.instance.current_collection_start_date].min
   end
 
-  def status
-    open_deactivation = location_deactivation_periods.deactivations_without_reactivation.first
-    recent_deactivation = location_deactivation_periods.order("created_at").last
+  def open_deactivation
+    location_deactivation_periods.deactivations_without_reactivation.first
+  end
+
+  def recent_deactivation
+    location_deactivation_periods.order("created_at").last
+  end
 
-    return :deactivated if open_deactivation&.deactivation_date.present? && Time.zone.now >= open_deactivation.deactivation_date
-    return :deactivating_soon if open_deactivation&.deactivation_date.present? && Time.zone.now < open_deactivation.deactivation_date
-    return :reactivating_soon if recent_deactivation&.reactivation_date.present? && Time.zone.now < recent_deactivation.reactivation_date
-    return :activating_soon if startdate.present? && Time.zone.now < startdate
+  def status(date = Time.zone.now)
+    return :deactivated if open_deactivation&.deactivation_date.present? && date >= open_deactivation.deactivation_date
+    return :deactivating_soon if open_deactivation&.deactivation_date.present? && date < open_deactivation.deactivation_date
+    return :reactivating_soon if recent_deactivation&.reactivation_date.present? && date < recent_deactivation.reactivation_date
+    return :activating_soon if startdate.present? && date < startdate
 
     :active
   end
diff --git a/app/models/scheme.rb b/app/models/scheme.rb
index fce696bb6..6cb89f434 100644
--- a/app/models/scheme.rb
+++ b/app/models/scheme.rb
@@ -213,15 +213,19 @@ class Scheme < ApplicationRecord
     [created_at, FormHandler.instance.current_collection_start_date].min
   end
 
-  def status
-    return :incomplete unless confirmed
+  def open_deactivation
+    scheme_deactivation_periods.deactivations_without_reactivation.first
+  end
 
-    open_deactivation = scheme_deactivation_periods.deactivations_without_reactivation.first
-    recent_deactivation = scheme_deactivation_periods.order("created_at").last
+  def recent_deactivation
+    scheme_deactivation_periods.order("created_at").last
+  end
 
-    return :deactivated if open_deactivation&.deactivation_date.present? && Time.zone.now >= open_deactivation.deactivation_date
-    return :deactivating_soon if open_deactivation&.deactivation_date.present? && Time.zone.now < open_deactivation.deactivation_date
-    return :reactivating_soon if recent_deactivation&.reactivation_date.present? && Time.zone.now < recent_deactivation.reactivation_date
+  def status(date = Time.zone.now)
+    return :incomplete unless confirmed
+    return :deactivated if open_deactivation&.deactivation_date.present? && date >= open_deactivation.deactivation_date
+    return :deactivating_soon if open_deactivation&.deactivation_date.present? && date < open_deactivation.deactivation_date
+    return :reactivating_soon if recent_deactivation&.reactivation_date.present? && date < recent_deactivation.reactivation_date
 
     :active
   end
diff --git a/app/models/validations/date_validations.rb b/app/models/validations/date_validations.rb
index 71b7837dc..ceec8ed9a 100644
--- a/app/models/validations/date_validations.rb
+++ b/app/models/validations/date_validations.rb
@@ -1,4 +1,6 @@
 module Validations::DateValidations
+  include Validations::SharedValidations
+
   def validate_property_major_repairs(record)
     date_valid?("mrcdate", record)
     if record["startdate"].present? && record["mrcdate"].present? && record["startdate"] < record["mrcdate"]
@@ -60,15 +62,8 @@ module Validations::DateValidations
       record.errors.add :startdate, I18n.t("validations.setup.startdate.after_major_repair_date")
     end
 
-    location_inactive_status = inactive_status(record.startdate, record.location&.location_deactivation_periods, record.location&.available_from)
-    if location_inactive_status.present?
-      record.errors.add :startdate, I18n.t("validations.setup.startdate.location_#{location_inactive_status[:status]}", postcode: record.location.postcode, date: location_inactive_status[:date].to_formatted_s(:govuk_date), deactivation_date: location_inactive_status[:deactivation_date]&.to_formatted_s(:govuk_date))
-    end
-
-    scheme_inactive_status = inactive_status(record.startdate, record.scheme&.scheme_deactivation_periods, record.scheme&.available_from)
-    if scheme_inactive_status.present?
-      record.errors.add :startdate, I18n.t("validations.setup.startdate.scheme_#{scheme_inactive_status[:status]}", name: record.scheme.service_name, date: scheme_inactive_status[:date].to_formatted_s(:govuk_date), deactivation_date: scheme_inactive_status[:deactivation_date]&.to_formatted_s(:govuk_date))
-    end
+    location_during_startdate_validation(record, :startdate)
+    scheme_during_startdate_validation(record, :startdate)
   end
 
 private
@@ -101,15 +96,4 @@ private
   def is_rsnvac_first_let?(record)
     [15, 16, 17].include?(record["rsnvac"])
   end
-
-  def inactive_status(date, deactivation_periods, available_from)
-    return if date.blank?
-
-    closest_reactivation = deactivation_periods.order(created_at: :desc).find { |period| period.reactivation_date.present? && date.between?(period.deactivation_date, period.reactivation_date - 1.day) } if deactivation_periods.present?
-    return { status: "reactivating_soon", date: closest_reactivation.reactivation_date, deactivation_date: closest_reactivation.deactivation_date } if closest_reactivation.present?
-    return { status: "activating_soon", date: available_from } if available_from.present? && available_from > date
-
-    open_deactivation = deactivation_periods.deactivations_without_reactivation.first if deactivation_periods.present?
-    return { status: "deactivated", date: open_deactivation.deactivation_date } if open_deactivation.present? && open_deactivation.deactivation_date <= date
-  end
 end
diff --git a/app/models/validations/setup_validations.rb b/app/models/validations/setup_validations.rb
index 19eb7dcf3..c1bdc3a71 100644
--- a/app/models/validations/setup_validations.rb
+++ b/app/models/validations/setup_validations.rb
@@ -1,4 +1,6 @@
 module Validations::SetupValidations
+  include Validations::SharedValidations
+
   def validate_irproduct_other(record)
     if intermediate_product_rent_type?(record) && record.irproduct_other.blank?
       record.errors.add :irproduct_other, I18n.t("validations.setup.intermediate_rent_product_name.blank")
@@ -6,12 +8,12 @@ module Validations::SetupValidations
   end
 
   def validate_location(record)
-    validate_location_during_startdate(record, :location_id)
+    location_during_startdate_validation(record, :location_id)
   end
 
   def validate_scheme(record)
-    validate_location_during_startdate(record, :scheme_id)
-    validate_scheme_during_startdate(record)
+    location_during_startdate_validation(record, :scheme_id)
+    scheme_during_startdate_validation(record, :scheme_id)
   end
 
 private
@@ -19,29 +21,4 @@ private
   def intermediate_product_rent_type?(record)
     record.rent_type == 5
   end
-
-  def inactive_status(date, deactivation_periods, available_from)
-    return if date.blank?
-
-    closest_reactivation = deactivation_periods.reverse.find { |period| period.reactivation_date.present? && date.between?(period.deactivation_date, period.reactivation_date - 1.day) } if deactivation_periods.present?
-    return { status: "reactivating_soon", date: closest_reactivation.reactivation_date, deactivation_date: closest_reactivation.deactivation_date } if closest_reactivation.present?
-    return { status: "activating_soon", date: available_from } if available_from.present? && available_from > date
-
-    open_deactivation = deactivation_periods.deactivations_without_reactivation.first if deactivation_periods.present?
-    return { status: "deactivated", date: open_deactivation.deactivation_date } if open_deactivation.present? && open_deactivation.deactivation_date <= date
-  end
-
-  def validate_location_during_startdate(record, field)
-    location_inactive_status = inactive_status(record.startdate, record.location&.location_deactivation_periods, record.location&.available_from)
-    if location_inactive_status.present?
-      record.errors.add field, I18n.t("validations.setup.startdate.location_#{location_inactive_status[:status]}", postcode: record.location.postcode, date: location_inactive_status[:date].to_formatted_s(:govuk_date), deactivation_date: location_inactive_status[:deactivation_date]&.to_formatted_s(:govuk_date))
-    end
-  end
-
-  def validate_scheme_during_startdate(record)
-    scheme_inactive_status = inactive_status(record.startdate, record.scheme&.scheme_deactivation_periods, record.scheme&.available_from)
-    if scheme_inactive_status.present?
-      record.errors.add :scheme_id, I18n.t("validations.setup.startdate.scheme_#{scheme_inactive_status[:status]}", name: record.scheme.service_name, date: scheme_inactive_status[:date].to_formatted_s(:govuk_date), deactivation_date: scheme_inactive_status[:deactivation_date]&.to_formatted_s(:govuk_date))
-    end
-  end
 end
diff --git a/app/models/validations/shared_validations.rb b/app/models/validations/shared_validations.rb
index 9b4f8a3ff..dac9012ae 100644
--- a/app/models/validations/shared_validations.rb
+++ b/app/models/validations/shared_validations.rb
@@ -33,4 +33,40 @@ module Validations::SharedValidations
       end
     end
   end
+
+  def location_during_startdate_validation(record, field)
+    location_inactive_status = inactive_status(record.startdate, record.location&.available_from, record.location)
+    if location_inactive_status.present?
+      record.errors.add field, I18n.t("validations.setup.startdate.location_#{location_inactive_status[:status]}", postcode: record.location.postcode, date: location_inactive_status[:reactivation_date].to_formatted_s(:govuk_date), deactivation_date: location_inactive_status[:deactivation_date]&.to_formatted_s(:govuk_date))
+    end
+  end
+
+  def scheme_during_startdate_validation(record, field)
+    scheme_inactive_status = inactive_status(record.startdate, record.scheme&.available_from, record.scheme)
+    if scheme_inactive_status.present?
+      record.errors.add field, I18n.t("validations.setup.startdate.scheme_#{scheme_inactive_status[:status]}", name: record.scheme.service_name, date: scheme_inactive_status[:reactivation_date].to_formatted_s(:govuk_date), deactivation_date: scheme_inactive_status[:deactivation_date]&.to_formatted_s(:govuk_date))
+    end
+  end
+
+  def inactive_status(date, available_from, resource)
+    return if date.blank? || resource.blank?
+
+    status = resource.status(date)
+    return unless %i[reactivating_soon activating_soon deactivated].include?(status)
+
+    closest_reactivation = resource.recent_deactivation
+    open_deactivation = resource.open_deactivation
+
+    case status
+    when :reactivating_soon
+      reactivation_date = closest_reactivation.reactivation_date
+      deactivation_date = closest_reactivation.deactivation_date
+    when :activating_soon
+      reactivation_date = available_from
+    when :deactivated
+      reactivation_date = open_deactivation.deactivation_date
+    end
+
+    { status:, reactivation_date:, deactivation_date: }
+  end
 end