diff --git a/handler/rfc8693/token_exchange_test.go b/handler/rfc8693/token_exchange_test.go
index 352c68af..b1bfc3bd 100644
--- a/handler/rfc8693/token_exchange_test.go
+++ b/handler/rfc8693/token_exchange_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pborman/uuid"
+	"github.com/google/uuid"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -74,8 +74,10 @@ func TestAccessTokenExchangeImpersonation(t *testing.T) {
 	}
 
 	coreStrategy := &oauth2.HMACSHAStrategy{
-		Enigma: &hmac.HMACStrategy{Config: config},
-		Config: config,
+		HMACSHAStrategyUnPrefixed: &oauth2.HMACSHAStrategyUnPrefixed{
+			Enigma: &hmac.HMACStrategy{Config: config},
+			Config: config,
+		},
 	}
 
 	genericTEHandler := &TokenExchangeGrantHandler{
@@ -109,7 +111,7 @@ func TestAccessTokenExchangeImpersonation(t *testing.T) {
 			handlers: []fosite.TokenEndpointHandler{genericTEHandler, accessTokenHandler},
 			areq: &fosite.AccessRequest{
 				Request: fosite.Request{
-					ID:     uuid.New(),
+					ID:     uuid.NewString(),
 					Client: store.Clients["my-client"],
 					Form: url.Values{
 						"subject_token_type": []string{rfc8693.AccessTokenType},
@@ -135,7 +137,7 @@ func TestAccessTokenExchangeImpersonation(t *testing.T) {
 			handlers: []fosite.TokenEndpointHandler{genericTEHandler, accessTokenHandler, customJWTHandler},
 			areq: &fosite.AccessRequest{
 				Request: fosite.Request{
-					ID:     uuid.New(),
+					ID:     uuid.NewString(),
 					Client: store.Clients["my-client"],
 					Form: url.Values{
 						"subject_token_type": []string{jwtName},