diff --git a/spec/system/admin/products_v3/create_spec.rb b/spec/system/admin/products_v3/create_spec.rb
index d2af1c8899..e36ba0c9fa 100644
--- a/spec/system/admin/products_v3/create_spec.rb
+++ b/spec/system/admin/products_v3/create_spec.rb
@@ -90,9 +90,9 @@ RSpec.describe 'As an enterprise user, I can manage my products' do
           select taxon.name, from: 'Category'
 
           if stock == "on_hand"
-            find('input[id$="_on_hand"]').fill_in with: "66"
+            find('input[id$="_on_hand_desired"]').fill_in with: "66"
           elsif stock == "on_demand"
-            find('input[id$="_on_demand"]').check
+            find('input[id$="_on_demand_desired"]').check
           end
         end
 
diff --git a/spec/system/admin/products_v3/update_spec.rb b/spec/system/admin/products_v3/update_spec.rb
index d7fd2b0c02..d82fa77400 100644
--- a/spec/system/admin/products_v3/update_spec.rb
+++ b/spec/system/admin/products_v3/update_spec.rb
@@ -667,6 +667,9 @@ RSpec.describe 'As an enterprise user, I can update my products' do
           fill_in "Name", with: "Large box"
           click_on "On Hand"
           fill_in "On Hand", with: "19"
+          tomselect_select("Weight (kg)", from: "Unit scale")
+          click_on "Unit"
+          fill_in "Unit value", with: "1"
         end
 
         click_button "Save changes"
@@ -682,6 +685,9 @@ RSpec.describe 'As an enterprise user, I can update my products' do
           fill_in "Name", with: "Large box"
           click_on "On Hand"
           check "On demand"
+          tomselect_select("Weight (kg)", from: "Unit scale")
+          click_on "Unit"
+          fill_in "Unit value", with: "1"
         end
 
         click_button "Save changes"