diff --git a/tests/dbal/migration/schema.php b/tests/dbal/migration/schema.php
index d91ed6a316..04c20c46cb 100644
--- a/tests/dbal/migration/schema.php
+++ b/tests/dbal/migration/schema.php
@@ -26,9 +26,9 @@ class phpbb_dbal_migration_schema extends \phpbb\db\migration\migration
 					'COLUMNS' => [
 						'module_id'			=> ['UINT:3', NULL, 'auto_increment'],
 						'user_id'			=> ['ULINT', 0],
-						'endpoint'			=> ['TEXT', ''],
+						'endpoint'			=> ['VCHAR:220', ''],
 						'expiration_time'	=> ['TIMESTAMP', 0],
-						'p256dh'			=> ['VCHAR', ''],
+						'p256dh'			=> ['VCHAR:200', ''],
 						'auth'				=> ['VCHAR:100', ''],
 					],
 					'PRIMARY_KEY'	=> 'module_id',
diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php
index 95bec1a133..5c86a72a27 100644
--- a/tests/dbal/migrator_test.php
+++ b/tests/dbal/migrator_test.php
@@ -422,7 +422,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
 			{
 				case 'i_simple':
 					$this->assertEquals(['user_id', 'endpoint'], $index_data['columns']);
-					$this->assertEmpty($index_data['flags']);
+					$this->assertEquals($is_mssql ? ['clustered'] : [], $index_data['flags']);
 					$this->assertFalse($index_data['is_primary']);
 					$this->assertFalse($index_data['is_unique']);
 					$this->assertTrue($index_data['is_simple']);
@@ -432,7 +432,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
 				break;
 				case 'i_uniq':
 					$this->assertEquals(['expiration_time', 'p256dh'], $index_data['columns']);
-					$this->assertEmpty($index_data['flags']);
+					$this->assertEquals($is_mssql ? ['clustered'] : [], $index_data['flags']);
 					$this->assertFalse($index_data['is_primary']);
 					$this->assertTrue($index_data['is_unique']);
 					$this->assertFalse($index_data['is_simple']);
@@ -442,7 +442,7 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
 				break;
 				case 'i_auth':
 					$this->assertEquals(['auth'], $index_data['columns']);
-					$this->assertEmpty($index_data['flags']);
+					$this->assertEquals($is_mssql ? ['clustered'] : [], $index_data['flags']);
 					$this->assertFalse($index_data['is_primary']);
 					$this->assertFalse($index_data['is_unique']);
 					$this->assertTrue($index_data['is_simple']);