diff --git a/tests/30rooms/60version_upgrade.pl b/tests/30rooms/60version_upgrade.pl
index 4e847e5c2..f0fafd06d 100644
--- a/tests/30rooms/60version_upgrade.pl
+++ b/tests/30rooms/60version_upgrade.pl
@@ -680,6 +680,7 @@ sub upgrade_room_synced {
             type    => "m.room.canonical_alias",
             content => {
                alias => $room_alias_1,
+               alt_aliases => [ $room_alias_2 ],
             },
          );
       })->then( sub {
@@ -692,17 +693,6 @@ sub upgrade_room_synced {
          );
       })->then( sub {
          ( $new_room_id ) = @_;
-
-      # m.room.aliases are filtered out until a better solution to mitigating abuse is is specced.
-      #
-      #    matrix_get_room_state(
-      #       $creator, $room_id,
-      #       type=>'m.room.aliases', state_key=>$server_name,
-      #    );
-      # })->then( sub {
-      #    my ( $old_aliases ) = @_;
-      #    assert_deeply_eq( $old_aliases, {aliases => []}, "aliases on old room" );
-
          matrix_get_room_state( $creator, $room_id, type=>'m.room.canonical_alias' );
       })->then( sub {
          my ( $old_canonical_alias ) = @_;
@@ -710,20 +700,6 @@ sub upgrade_room_synced {
             $old_canonical_alias, {}, "canonical_alias on old room",
          );
 
-      # m.room.aliases are filtered out until a better solution to mitigating abuse is is specced.
-      #
-      #    matrix_get_room_state(
-      #       $creator, $new_room_id,
-      #       type=>'m.room.aliases', state_key=>$server_name,
-      #    );
-      # })->then( sub {
-      #    my ( $new_aliases ) = @_;
-      #    assert_deeply_eq(
-      #       [ sort( @{ $new_aliases->{aliases} } ) ],
-      #       [ sort( $room_alias_1, $room_alias_2 ) ],
-      #       "aliases on new room",
-      #    );
-
          matrix_get_room_state(
             $creator, $new_room_id, type=>'m.room.canonical_alias',
          );
@@ -731,7 +707,10 @@ sub upgrade_room_synced {
          my ( $new_canonical_alias ) = @_;
          assert_deeply_eq(
             $new_canonical_alias,
-            { alias => $room_alias_1 },
+            {
+               alias => $room_alias_1,
+               alt_aliases => [ $room_alias_2 ],
+            },
             "canonical_alias on new room",
          );