diff --git a/app/models/user.rb b/app/models/user.rb
index 3fc8a3ef785..03bab176cfa 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -114,10 +114,6 @@ def gpo_verification_pending_profile
     profiles.where.not(gpo_verification_pending_at: nil).order(created_at: :desc).first
   end
 
-  def fraud_review_eligible?
-    fraud_review_pending_profile&.fraud_review_pending_at&.after?(30.days.ago)
-  end
-
   def fraud_review_pending?
     fraud_review_pending_profile.present?
   end
diff --git a/lib/tasks/review_profile.rake b/lib/tasks/review_profile.rake
index a448b0917b3..9d888000c42 100644
--- a/lib/tasks/review_profile.rake
+++ b/lib/tasks/review_profile.rake
@@ -26,7 +26,7 @@ namespace :users do
         next
       end
 
-      if user.fraud_review_eligible?
+      if FraudReviewChecker.new(user).fraud_review_eligible?
         profile = user.fraud_review_pending_profile
         profile.activate_after_passing_review
 
@@ -73,7 +73,7 @@ namespace :users do
         next
       end
 
-      if user.fraud_review_eligible?
+      if FraudReviewChecker.new(user).fraud_review_eligible?
         profile = user.fraud_review_pending_profile
 
         profile.reject_for_fraud(notify_user: true)
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index e74fe2bca5c..72d4730de15 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -529,47 +529,6 @@
     end
   end
 
-  describe '#fraud_review_eligible?' do
-    context 'when fraud_review_pending_at is nil' do
-      it 'returns false' do
-        fraud_review_pending_at = nil
-
-        user = create(:user)
-        user.profiles.create(
-          fraud_review_pending_at: fraud_review_pending_at,
-        )
-
-        expect(user.fraud_review_eligible?).to be_falsey
-      end
-    end
-
-    context 'when verified_at is within 30 days' do
-      it 'returns true' do
-        fraud_review_pending_at = 15.days.ago
-
-        user = create(:user)
-        user.profiles.create(
-          fraud_review_pending_at: fraud_review_pending_at,
-        )
-
-        expect(user.fraud_review_eligible?).to eq true
-      end
-    end
-
-    context 'when verified_at is older than 30 days' do
-      it 'returns false' do
-        fraud_review_pending_at = 45.days.ago
-
-        user = create(:user)
-        user.profiles.create(
-          fraud_review_pending_at: fraud_review_pending_at,
-        )
-
-        expect(user.fraud_review_eligible?).to eq false
-      end
-    end
-  end
-
   describe '#fraud_review_pending?' do
     it 'returns true if fraud review is pending' do
       user = create(:user)