Merge remote-tracking branch 'origin/release-v1.26.0' into matrix-org-hotfixes

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/http/test_endpoint.py b/tests/http/test_endpoint.py

index b2e9533b07..d06ea518ce 100644
--- a/tests/http/test_endpoint.py
+++ b/tests/http/test_endpoint.py
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from synapse.http.endpoint import parse_and_validate_server_name, parse_server_name
+from synapse.util.stringutils import parse_and_validate_server_name, parse_server_name
 
 from tests import unittest