diff --git a/test/controllers/boards/columns_controller_test.rb b/test/controllers/boards/columns_controller_test.rb
index c24cd1cb3..dab8ae5bd 100644
--- a/test/controllers/boards/columns_controller_test.rb
+++ b/test/controllers/boards/columns_controller_test.rb
@@ -19,13 +19,13 @@ class Boards::ColumnsControllerTest < ActionDispatch::IntegrationTest
     assert_equal "New Column", boards(:writebook).columns.last.name
   end
 
-  test "create refreshes sibling columns" do
+  test "create refreshes surrounding columns" do
     board = boards(:writebook)
-    existing_columns = board.columns.to_a
 
     post board_columns_path(board), params: { column: { name: "New Column" } }, as: :turbo_stream
 
-    existing_columns.each do |column|
+    new_column = board.columns.find_by!(name: "New Column")
+    new_column.surroundings.each do |column|
       assert_turbo_stream action: :replace, target: dom_id(column)
     end
   end
@@ -48,15 +48,14 @@ class Boards::ColumnsControllerTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test "destroy refreshes sibling columns" do
-    board = boards(:writebook)
-    column = columns(:writebook_on_hold)
-    sibling_columns = column.sibling_columns.to_a
+  test "destroy refreshes surrounding columns" do
+    column = columns(:writebook_in_progress)
+    surroundings = column.surroundings.to_a
 
-    delete board_column_path(board, column), as: :turbo_stream
+    delete board_column_path(column.board, column), as: :turbo_stream
 
-    sibling_columns.each do |sibling_column|
-      assert_turbo_stream action: :replace, target: dom_id(sibling_column)
+    surroundings.each do |surrounding|
+      assert_turbo_stream action: :replace, target: dom_id(surrounding)
     end
   end
 end
diff --git a/test/controllers/columns/left_positions_controller_test.rb b/test/controllers/columns/left_positions_controller_test.rb
index 2f31decd9..cce5b67ef 100644
--- a/test/controllers/columns/left_positions_controller_test.rb
+++ b/test/controllers/columns/left_positions_controller_test.rb
@@ -21,14 +21,13 @@ class Columns::LeftPositionsControllerTest < ActionDispatch::IntegrationTest
     assert_equal original_position_a, column_b.reload.position
   end
 
-  test "move left refreshes sibling columns" do
+  test "move left refreshes surrounding columns" do
     column = columns(:writebook_in_progress)
-    sibling_columns = column.sibling_columns.to_a
 
     post column_left_position_path(column), as: :turbo_stream
 
-    sibling_columns.each do |sibling_column|
-      assert_turbo_stream action: :replace, target: dom_id(sibling_column)
+    column.reload.surroundings.each do |surrounding|
+      assert_turbo_stream action: :replace, target: dom_id(surrounding)
     end
   end
 
diff --git a/test/controllers/columns/right_positions_controller_test.rb b/test/controllers/columns/right_positions_controller_test.rb
index 9bdf3099c..16c3ebba9 100644
--- a/test/controllers/columns/right_positions_controller_test.rb
+++ b/test/controllers/columns/right_positions_controller_test.rb
@@ -21,14 +21,13 @@ class Columns::RightPositionsControllerTest < ActionDispatch::IntegrationTest
     assert_equal original_position_a, column_b.reload.position
   end
 
-  test "move right refreshes sibling columns" do
+  test "move right refreshes surrounding columns" do
     column = columns(:writebook_in_progress)
-    sibling_columns = column.sibling_columns.to_a
 
     post column_right_position_path(column), as: :turbo_stream
 
-    sibling_columns.each do |sibling_column|
-      assert_turbo_stream action: :replace, target: dom_id(sibling_column)
+    column.reload.surroundings.each do |surrounding|
+      assert_turbo_stream action: :replace, target: dom_id(surrounding)
     end
   end
 
diff --git a/test/models/column/positioned_test.rb b/test/models/column/positioned_test.rb
index 216fc9c68..4ef910977 100644
--- a/test/models/column/positioned_test.rb
+++ b/test/models/column/positioned_test.rb
@@ -60,9 +60,9 @@ class Column::PositionedTest < ActiveSupport::TestCase
     assert_equal original_position, rightmost_column.reload.position
   end
 
-  test "creating a column touches sibling columns" do
+  test "creating a column touches surrounding columns" do
     board = boards(:writebook)
-    column = board.columns.first
+    column = board.columns.sorted.last
     original_updated_at = column.updated_at
 
     travel 1.second do
@@ -72,17 +72,21 @@ class Column::PositionedTest < ActiveSupport::TestCase
     assert_operator column.reload.updated_at, :>, original_updated_at
   end
 
-  test "destroying a column touches sibling columns" do
+  test "destroying a column touches surrounding columns" do
     board = boards(:writebook)
     columns = board.columns.sorted.to_a
-    column_to_keep = columns.first
-    column_to_destroy = columns.last
-    original_updated_at = column_to_keep.updated_at
+    column_to_destroy = columns[1]
+    left_neighbor = columns[0]
+    right_neighbor = columns[2]
+
+    original_left_updated_at = left_neighbor.updated_at
+    original_right_updated_at = right_neighbor.updated_at
 
     travel 1.second do
       column_to_destroy.destroy
     end
 
-    assert_operator column_to_keep.reload.updated_at, :>, original_updated_at
+    assert_operator left_neighbor.reload.updated_at, :>, original_left_updated_at
+    assert_operator right_neighbor.reload.updated_at, :>, original_right_updated_at
   end
 end