diff --git a/e2e/ratchet/ratchet_test.go b/e2e/ratchet/ratchet_test.go
index 1b87c88acda50c3725660bfbb0270aa9a5d0f827..a627f6518ef359880a876058c0c21cd899df215b 100644
--- a/e2e/ratchet/ratchet_test.go
+++ b/e2e/ratchet/ratchet_test.go
@@ -102,7 +102,7 @@ func TestStore_AddPartner(t *testing.T) {
 	receivedManager, err := r.AddPartner(
 		r.defaultID, partnerID,
 		partnerPubKey, r.defaultDHPrivateKey,
-		pubSIDHKey, myPrivSIDHKey, p, p, true)
+		pubSIDHKey, myPrivSIDHKey, p, p)
 	if err != nil {
 		t.Fatalf("AddPartner returned an error: %v", err)
 	}
@@ -142,7 +142,7 @@ func TestStore_DeletePartner(t *testing.T) {
 	myPrivSIDHKey, _ := genSidhKeys(rng, sidh.KeyVariantSidhB)
 
 	_, err = r.AddPartner(r.defaultID, partnerID, r.defaultDHPrivateKey,
-		partnerPubKey, pubSIDHKey, myPrivSIDHKey, p, p, true)
+		partnerPubKey, pubSIDHKey, myPrivSIDHKey, p, p)
 	if err != nil {
 		t.Fatalf("AddPartner returned an error: %v", err)
 	}
@@ -172,7 +172,7 @@ func TestStore_GetPartner(t *testing.T) {
 	_, pubSIDHKey := genSidhKeys(rng, sidh.KeyVariantSidhA)
 	myPrivSIDHKey, _ := genSidhKeys(rng, sidh.KeyVariantSidhB)
 	expectedManager, err := r.AddPartner(r.defaultID, partnerID, r.defaultDHPrivateKey,
-		partnerPubKey, pubSIDHKey, myPrivSIDHKey, p, p, true)
+		partnerPubKey, pubSIDHKey, myPrivSIDHKey, p, p)
 	if err != nil {
 		t.Fatalf("AddPartner returned an error: %v", err)
 	}
diff --git a/e2e/rekey/exchange_test.go b/e2e/rekey/exchange_test.go
index c278f5c47817b3262154e2e8ad3f2e9f7a39a62d..e1a6c6b3fdfa275f80771db9936eced4df070cfb 100644
--- a/e2e/rekey/exchange_test.go
+++ b/e2e/rekey/exchange_test.go
@@ -90,11 +90,15 @@ func TestFullExchange(t *testing.T) {
 	// Add Alice and Bob as partners
 	sendParams := session.GetDefaultParams()
 	receiveParams := session.GetDefaultParams()
-	_, err = r.AddPartner(myID, bobID, bobPubKey, alicePrivKey, bobSIDHPubKey, aliceSIDHPrivKey, sendParams, receiveParams, false)
+	_, err = r.AddPartner(myID, bobID, bobPubKey,
+		alicePrivKey, bobSIDHPubKey, aliceSIDHPrivKey,
+		sendParams, receiveParams)
 	if err != nil {
 		t.Errorf("Failed to add partner to ratchet: %+v", err)
 	}
-	_, err = r.AddPartner(bobID, myID, alicePubKey, bobPrivKey, aliceSIDHPubKey, bobSIDHPrivKey, sendParams, receiveParams, false)
+	_, err = r.AddPartner(bobID, myID, alicePubKey,
+		bobPrivKey, aliceSIDHPubKey, bobSIDHPrivKey,
+		sendParams, receiveParams)
 	if err != nil {
 		t.Errorf("Failed to add partner to ratchet: %+v", err)
 	}
diff --git a/e2e/rekey/trigger_test.go b/e2e/rekey/trigger_test.go
index 2b2f197c8a7befb9a38f86f0841c43b20305cd84..15d47d6c57713a68ab89d6e7b0f49cf34a39ea8f 100644
--- a/e2e/rekey/trigger_test.go
+++ b/e2e/rekey/trigger_test.go
@@ -83,11 +83,15 @@ func TestHandleTrigger(t *testing.T) {
 	// Add bob as a partner
 	sendParams := session2.GetDefaultParams()
 	receiveParams := session2.GetDefaultParams()
-	_, err = r.AddPartner(myID, bobID, bobPubKey, alicePrivKey, bobSIDHPubKey, aliceSIDHPrivKey, sendParams, receiveParams, false)
+	_, err = r.AddPartner(myID, bobID, bobPubKey,
+		alicePrivKey, bobSIDHPubKey, aliceSIDHPrivKey,
+		sendParams, receiveParams)
 	if err != nil {
 		t.Errorf("Failed to add partner to ratchet: %+v", err)
 	}
-	_, err = r.AddPartner(bobID, myID, alicePubKey, bobPrivKey, aliceSIDHPubKey, bobSIDHPrivKey, sendParams, receiveParams, false)
+	_, err = r.AddPartner(bobID, myID, alicePubKey, bobPrivKey,
+		aliceSIDHPubKey, bobSIDHPrivKey,
+		sendParams, receiveParams)
 	if err != nil {
 		t.Errorf("Failed to add partner to ratchet: %+v", err)
 	}