diff --git a/core/lib/spree/testing_support/dummy_app.rb b/core/lib/spree/testing_support/dummy_app.rb
index ffc4cf619a3..efce592b48b 100644
--- a/core/lib/spree/testing_support/dummy_app.rb
+++ b/core/lib/spree/testing_support/dummy_app.rb
@@ -90,7 +90,7 @@ class Application < ::Rails::Application
     config.active_record.dump_schema_after_migration = false
 
     # Configure active storage to use storage within tmp folder
-    unless ENV['DISABLE_ACTIVE_STORAGE']
+    unless (ENV['DISABLE_ACTIVE_STORAGE'] == 'true')
       initializer 'solidus.active_storage' do
         config.active_storage.service_configurations = {
           test: {
@@ -140,7 +140,7 @@ class Application < ::Rails::Application
 Spree.config do |config|
   config.use_legacy_events = (ENV['USE_LEGACY_EVENTS'] == 'true')
 
-  if ENV['DISABLE_ACTIVE_STORAGE']
+  if (ENV['DISABLE_ACTIVE_STORAGE'] == 'true')
     config.image_attachment_module = 'Spree::Image::PaperclipAttachment'
     config.taxon_attachment_module = 'Spree::Taxon::PaperclipAttachment'
   end
diff --git a/core/spec/models/spree/concerns/active_storage_adapter/attachment_spec.rb b/core/spec/models/spree/concerns/active_storage_adapter/attachment_spec.rb
index fd528073194..27eeaeb1bf5 100644
--- a/core/spec/models/spree/concerns/active_storage_adapter/attachment_spec.rb
+++ b/core/spec/models/spree/concerns/active_storage_adapter/attachment_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-unless ENV['DISABLE_ACTIVE_STORAGE']
+unless (ENV['DISABLE_ACTIVE_STORAGE'] == 'true')
   RSpec.describe Spree::ActiveStorageAdapter::Attachment do
     describe '#variant' do
       it "converts to resize_to_limit when definition doesn't contain any special symbol" do
diff --git a/core/spec/rails_helper.rb b/core/spec/rails_helper.rb
index 6f69975c8da..f3b6e161509 100644
--- a/core/spec/rails_helper.rb
+++ b/core/spec/rails_helper.rb
@@ -37,7 +37,7 @@
   config.use_transactional_fixtures = true
 
   config.before :suite do
-    FileUtils.rm_rf(Rails.configuration.active_storage.service_configurations[:test][:root]) unless ENV['DISABLE_ACTIVE_STORAGE']
+    FileUtils.rm_rf(Rails.configuration.active_storage.service_configurations[:test][:root]) unless (ENV['DISABLE_ACTIVE_STORAGE'] == 'true')
     DatabaseCleaner.clean_with :truncation
   end