diff --git a/clientapi/auth/login_publickey_ethereum_test.go b/clientapi/auth/login_publickey_ethereum_test.go
index cd7db05b2..d90cd5f49 100644
--- a/clientapi/auth/login_publickey_ethereum_test.go
+++ b/clientapi/auth/login_publickey_ethereum_test.go
@@ -37,9 +37,7 @@ type loginContext struct {
 
 func createLoginContext(_ *testing.T) *loginContext {
 	cfg := &config.ClientAPI{
-		Matrix: &config.Global{
-			ServerName: testutil.TestServerName,
-		},
+		Matrix:                         &config.Global{},
 		Derived:                        &config.Derived{},
 		PasswordAuthenticationDisabled: true,
 		PublicKeyAuthentication: config.PublicKeyAuthentication{
diff --git a/clientapi/routing/register_publickey_test.go b/clientapi/routing/register_publickey_test.go
index 961873b89..19960ed22 100644
--- a/clientapi/routing/register_publickey_test.go
+++ b/clientapi/routing/register_publickey_test.go
@@ -42,9 +42,7 @@ type registerContext struct {
 
 func createRegisterContext(_ *testing.T) *registerContext {
 	cfg := &config.ClientAPI{
-		Matrix: &config.Global{
-			ServerName: testutil.TestServerName,
-		},
+		Matrix:                         &config.Global{},
 		Derived:                        &config.Derived{},
 		PasswordAuthenticationDisabled: true,
 		PublicKeyAuthentication: config.PublicKeyAuthentication{
diff --git a/clientapi/routing/register_test.go b/clientapi/routing/register_test.go
index bccc1b79b..f90b3f06c 100644
--- a/clientapi/routing/register_test.go
+++ b/clientapi/routing/register_test.go
@@ -475,7 +475,7 @@ func Test_register(t *testing.T) {
 
 				// The first request should return a userInteractiveResponse
 				switch r := resp.JSON.(type) {
-				case userInteractiveResponse:
+				case UserInteractiveResponse:
 					// Check that the flows are the ones we configured
 					if !reflect.DeepEqual(r.Flows, base.Cfg.Derived.Registration.Flows) {
 						t.Fatalf("unexpected registration flows: %+v, want %+v", r.Flows, base.Cfg.Derived.Registration.Flows)
@@ -506,7 +506,7 @@ func Test_register(t *testing.T) {
 				}
 
 				// If we reached this, we should have received a UIA response
-				uia, ok := resp.JSON.(userInteractiveResponse)
+				uia, ok := resp.JSON.(UserInteractiveResponse)
 				if !ok {
 					t.Fatalf("did not receive a userInteractiveResponse: %T", resp.JSON)
 				}