diff --git a/test/asynchronous/unified_format.py b/test/asynchronous/unified_format.py
index 09bf7e83ea..964d2df96d 100644
--- a/test/asynchronous/unified_format.py
+++ b/test/asynchronous/unified_format.py
@@ -564,8 +564,6 @@ def maybe_skip_test(self, spec):
                 self.skipTest("CSOT not implemented for watch()")
             if "cursors" in class_name:
                 self.skipTest("CSOT not implemented for cursors")
-            if "dropindex on collection" in description:
-                self.skipTest("PYTHON-5491")
             if (
                 "tailable" in class_name
                 or "tailable" in description
diff --git a/test/csot/deprecated-options.json b/test/csot/deprecated-options.json
index d3e4631ff4..647e1bf792 100644
--- a/test/csot/deprecated-options.json
+++ b/test/csot/deprecated-options.json
@@ -6750,16 +6750,23 @@
             }
           }
         },
+        {
+          "name": "createIndex",
+          "object": "collection",
+          "arguments": {
+            "keys": {
+              "x": 1
+            },
+            "timeoutMS": 100000,
+            "name": "x_1"
+          }
+        },
         {
           "name": "dropIndex",
           "object": "collection",
           "arguments": {
             "timeoutMS": 100000,
             "name": "x_1"
-          },
-          "expectError": {
-            "isClientError": false,
-            "isTimeoutError": false
           }
         }
       ]
@@ -6815,16 +6822,23 @@
             ]
           }
         },
+        {
+          "name": "createIndex",
+          "object": "collection",
+          "arguments": {
+            "keys": {
+              "x": 1
+            },
+            "timeoutMS": 100000,
+            "name": "x_1"
+          }
+        },
         {
           "name": "dropIndex",
           "object": "collection",
           "arguments": {
             "timeoutMS": 100000,
             "name": "x_1"
-          },
-          "expectError": {
-            "isClientError": false,
-            "isTimeoutError": false
           }
         }
       ],
@@ -6832,6 +6846,12 @@
         {
           "client": "client",
           "events": [
+            {
+              "commandStartedEvent": {
+                "commandName": "createIndexes",
+                "databaseName": "test"
+              }
+            },
             {
               "commandStartedEvent": {
                 "commandName": "dropIndexes",
@@ -6903,6 +6923,16 @@
             ]
           }
         },
+        {
+          "name": "createIndex",
+          "object": "collection",
+          "arguments": {
+            "keys": {
+              "x": 1
+            },
+            "name": "x_1"
+          }
+        },
         {
           "name": "dropIndex",
           "object": "collection",
@@ -6910,10 +6940,6 @@
             "timeoutMS": 1000,
             "maxTimeMS": 5000,
             "name": "x_1"
-          },
-          "expectError": {
-            "isClientError": false,
-            "isTimeoutError": false
           }
         }
       ],
@@ -6921,6 +6947,12 @@
         {
           "client": "client",
           "events": [
+            {
+              "commandStartedEvent": {
+                "commandName": "createIndexes",
+                "databaseName": "test"
+              }
+            },
             {
               "commandStartedEvent": {
                 "commandName": "dropIndexes",
@@ -7003,6 +7035,17 @@
             }
           }
         },
+        {
+          "name": "createIndex",
+          "object": "collection",
+          "arguments": {
+            "keys": {
+              "x": 1
+            },
+            "name": "x_1",
+            "timeoutMS": 100000
+          }
+        },
         {
           "name": "dropIndexes",
           "object": "collection",
diff --git a/test/csot/global-timeoutMS.json b/test/csot/global-timeoutMS.json
index 740bbad2e2..f1edbe68e3 100644
--- a/test/csot/global-timeoutMS.json
+++ b/test/csot/global-timeoutMS.json
@@ -5621,15 +5621,21 @@
             }
           }
         },
+        {
+          "name": "createIndex",
+          "object": "collection",
+          "arguments": {
+            "keys": {
+              "x": 1
+            },
+            "name": "x_1"
+          }
+        },
         {
           "name": "dropIndex",
           "object": "collection",
           "arguments": {
             "name": "x_1"
-          },
-          "expectError": {
-            "isClientError": false,
-            "isTimeoutError": false
           }
         }
       ],
@@ -5637,6 +5643,12 @@
         {
           "client": "client",
           "events": [
+            {
+              "commandStartedEvent": {
+                "commandName": "createIndexes",
+                "databaseName": "test"
+              }
+            },
             {
               "commandStartedEvent": {
                 "commandName": "dropIndexes",
diff --git a/test/csot/override-operation-timeoutMS.json b/test/csot/override-operation-timeoutMS.json
index 6fa0bd802a..f33f876137 100644
--- a/test/csot/override-operation-timeoutMS.json
+++ b/test/csot/override-operation-timeoutMS.json
@@ -3378,15 +3378,23 @@
             }
           }
         },
+        {
+          "name": "createIndex",
+          "object": "collection",
+          "arguments": {
+            "keys": {
+              "x": 1
+            },
+            "timeoutMS": 1000,
+            "name": "x_1"
+          }
+        },
         {
           "name": "dropIndex",
           "object": "collection",
           "arguments": {
             "timeoutMS": 1000,
             "name": "x_1"
-          },
-          "expectError": {
-            "isTimeoutError": false
           }
         }
       ],
@@ -3394,6 +3402,12 @@
         {
           "client": "client",
           "events": [
+            {
+              "commandStartedEvent": {
+                "commandName": "createIndexes",
+                "databaseName": "test"
+              }
+            },
             {
               "commandStartedEvent": {
                 "commandName": "dropIndexes",
@@ -3436,15 +3450,23 @@
             }
           }
         },
+        {
+          "name": "createIndex",
+          "object": "collection",
+          "arguments": {
+            "keys": {
+              "x": 1
+            },
+            "timeoutMS": 0,
+            "name": "x_1"
+          }
+        },
         {
           "name": "dropIndex",
           "object": "collection",
           "arguments": {
             "timeoutMS": 0,
             "name": "x_1"
-          },
-          "expectError": {
-            "isTimeoutError": false
           }
         }
       ],
@@ -3452,6 +3474,12 @@
         {
           "client": "client",
           "events": [
+            {
+              "commandStartedEvent": {
+                "commandName": "createIndexes",
+                "databaseName": "test"
+              }
+            },
             {
               "commandStartedEvent": {
                 "commandName": "dropIndexes",
diff --git a/test/csot/tailable-awaitData.json b/test/csot/tailable-awaitData.json
index 81683d3993..80e95ca906 100644
--- a/test/csot/tailable-awaitData.json
+++ b/test/csot/tailable-awaitData.json
@@ -78,7 +78,7 @@
       ]
     },
     {
-      "description": "error if maxAwaitTimeMS is greater than timeoutMS",
+      "description": "error on find if maxAwaitTimeMS is greater than timeoutMS",
       "operations": [
         {
           "name": "find",
@@ -90,13 +90,50 @@
             "maxAwaitTimeMS": 10
           },
           "expectError": {
-            "isClientError": true
+            "isClientError": true,
+            "isTimeoutError": false
+          }
+        }
+      ]
+    },
+    {
+      "description": "error on aggregate if maxAwaitTimeMS is greater than timeoutMS",
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [],
+            "timeoutMS": 5,
+            "maxAwaitTimeMS": 10
+          },
+          "expectError": {
+            "isClientError": true,
+            "isTimeoutError": false
+          }
+        }
+      ]
+    },
+    {
+      "description": "error on watch if maxAwaitTimeMS is greater than timeoutMS",
+      "operations": [
+        {
+          "name": "createChangeStream",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [],
+            "timeoutMS": 5,
+            "maxAwaitTimeMS": 10
+          },
+          "expectError": {
+            "isClientError": true,
+            "isTimeoutError": false
           }
         }
       ]
     },
     {
-      "description": "error if maxAwaitTimeMS is equal to timeoutMS",
+      "description": "error on find if maxAwaitTimeMS is equal to timeoutMS",
       "operations": [
         {
           "name": "find",
@@ -108,7 +145,44 @@
             "maxAwaitTimeMS": 5
           },
           "expectError": {
-            "isClientError": true
+            "isClientError": true,
+            "isTimeoutError": false
+          }
+        }
+      ]
+    },
+    {
+      "description": "error on aggregate if maxAwaitTimeMS is equal to timeoutMS",
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [],
+            "timeoutMS": 5,
+            "maxAwaitTimeMS": 5
+          },
+          "expectError": {
+            "isClientError": true,
+            "isTimeoutError": false
+          }
+        }
+      ]
+    },
+    {
+      "description": "error on watch if maxAwaitTimeMS is equal to timeoutMS",
+      "operations": [
+        {
+          "name": "createChangeStream",
+          "object": "collection",
+          "arguments": {
+            "pipeline": [],
+            "timeoutMS": 5,
+            "maxAwaitTimeMS": 5
+          },
+          "expectError": {
+            "isClientError": true,
+            "isTimeoutError": false
           }
         }
       ]
diff --git a/test/unified_format.py b/test/unified_format.py
index 3496b2ad44..c21f29fe19 100644
--- a/test/unified_format.py
+++ b/test/unified_format.py
@@ -563,8 +563,6 @@ def maybe_skip_test(self, spec):
                 self.skipTest("CSOT not implemented for watch()")
             if "cursors" in class_name:
                 self.skipTest("CSOT not implemented for cursors")
-            if "dropindex on collection" in description:
-                self.skipTest("PYTHON-5491")
             if (
                 "tailable" in class_name
                 or "tailable" in description