diff --git a/databroker/mongo_normalized.py b/databroker/mongo_normalized.py
index 98b90edc1..17ca49928 100644
--- a/databroker/mongo_normalized.py
+++ b/databroker/mongo_normalized.py
@@ -2205,7 +2205,7 @@ class BadShapeMetadata(Exception):
     pass
 
 
-def default_validate_shape(key, data, expected_shape):
+def default_validate_shape(key, data, expected_shape, uid=None):
     """
     Check that data.shape == expected.shape.
 
diff --git a/databroker/tests/conftest.py b/databroker/tests/conftest.py
index 0962d5c0f..d7864a569 100644
--- a/databroker/tests/conftest.py
+++ b/databroker/tests/conftest.py
@@ -1,5 +1,3 @@
-import contextlib
-import getpass
 import os
 import pytest
 import sys