diff --git a/ecc/bls12-381/bandersnatch/eddsa/bandersnatch_test.go b/ecc/bls12-381/bandersnatch/eddsa/bandersnatch_test.go
new file mode 100644
index 000000000..2f9010df0
--- /dev/null
+++ b/ecc/bls12-381/bandersnatch/eddsa/bandersnatch_test.go
@@ -0,0 +1,60 @@
+package eddsa
+
+import (
+	"bytes"
+	"crypto/sha256"
+	"encoding/hex"
+	"testing"
+
+	"github.com/consensys/gnark-crypto/ecc/bls12-381/bandersnatch"
+)
+
+// TestBandersnatchKAT pins the package to Bandersnatch: the key derived from a
+// fixed seed is a point of Bandersnatch and the deterministic signature of a
+// fixed message has a fixed value. Hand-written (not generated), kept by the
+// generator. Before the fix of the eddsa generator this package imported the
+// Jubjub curve: for this seed it produced the Jubjub public key
+// daac52a82846152c171193a2117ae80036dd81b666a986ff8515463ae385ba9d, which
+// is not on Bandersnatch.
+func TestBandersnatchKAT(t *testing.T) {
+	seed, _ := hex.DecodeString("0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20")
+	msg, _ := hex.DecodeString("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f")
+	const (
+		wantPub = "fd528572df93716b013e6b9861310b387d57f95e686b61e613c4cd7837fa2a81"
+		wantAX  = "71b5bd4031b1de4c412a22a5a8799faf3e9ac873798b149e1da6917b09565aaf"
+		wantAY  = "012afa3778cdc413e6616b685ef9577d380b3161986b3e016b7193df728552fd"
+		wantSig = "265c48151514c0e041a975523c0e43b6972b83f180712b70cce48213abac9fa2052ed9ef9b2504e0d93a4e5626e0c0f0b81ecffb065a184211baef45421c743b"
+	)
+
+	priv, err := GenerateKey(bytes.NewReader(seed))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// The public key must satisfy the Bandersnatch equation (a = -5), whatever
+	// the type of PublicKey.A: the coordinates are copied into a Bandersnatch point.
+	var p bandersnatch.PointAffine
+	p.X, p.Y = priv.PublicKey.A.X, priv.PublicKey.A.Y
+	if !p.IsOnCurve() {
+		t.Fatalf("public key %x is not a point of Bandersnatch", priv.PublicKey.Bytes())
+	}
+	if got := hex.EncodeToString(priv.PublicKey.Bytes()); got != wantPub {
+		t.Fatalf("public key %s, want %s", got, wantPub)
+	}
+	ax, ay := priv.PublicKey.A.X.Bytes(), priv.PublicKey.A.Y.Bytes()
+	if hex.EncodeToString(ax[:]) != wantAX || hex.EncodeToString(ay[:]) != wantAY {
+		t.Fatalf("public key coordinates (%x, %x), want (%s, %s)", ax, ay, wantAX, wantAY)
+	}
+
+	sig, err := priv.Sign(msg, sha256.New())
+	if err != nil {
+		t.Fatal(err)
+	}
+	if got := hex.EncodeToString(sig); got != wantSig {
+		t.Fatalf("signature %s, want %s", got, wantSig)
+	}
+	ok, err := priv.PublicKey.Verify(sig, msg, sha256.New())
+	if err != nil || !ok {
+		t.Fatalf("verification: %v %v", ok, err)
+	}
+}
diff --git a/ecc/bls12-381/bandersnatch/eddsa/doc.go b/ecc/bls12-381/bandersnatch/eddsa/doc.go
index 6a1e7e6cc..fdead5f14 100644
--- a/ecc/bls12-381/bandersnatch/eddsa/doc.go
+++ b/ecc/bls12-381/bandersnatch/eddsa/doc.go
@@ -3,7 +3,7 @@
 
 // Code generated by consensys/gnark-crypto DO NOT EDIT
 
-// Package eddsa provides EdDSA signature scheme on bls12-381's twisted edwards curve.
+// Package eddsa provides EdDSA signature scheme on bls12-381's bandersnatch twisted edwards curve.
 //
 // # See also
 //
diff --git a/ecc/bls12-381/bandersnatch/eddsa/eddsa.go b/ecc/bls12-381/bandersnatch/eddsa/eddsa.go
index fb5883d4d..972ec4f8f 100644
--- a/ecc/bls12-381/bandersnatch/eddsa/eddsa.go
+++ b/ecc/bls12-381/bandersnatch/eddsa/eddsa.go
@@ -12,8 +12,8 @@ import (
 	"io"
 	"math/big"
 
+	twistededwards "github.com/consensys/gnark-crypto/ecc/bls12-381/bandersnatch"
 	"github.com/consensys/gnark-crypto/ecc/bls12-381/fr"
-	"github.com/consensys/gnark-crypto/ecc/bls12-381/twistededwards"
 	"github.com/consensys/gnark-crypto/signature"
 	"golang.org/x/crypto/blake2b"
 )
diff --git a/ecc/bls12-381/bandersnatch/eddsa/eddsa_test.go b/ecc/bls12-381/bandersnatch/eddsa/eddsa_test.go
index 25011ee6f..2c6bb7d13 100644
--- a/ecc/bls12-381/bandersnatch/eddsa/eddsa_test.go
+++ b/ecc/bls12-381/bandersnatch/eddsa/eddsa_test.go
@@ -15,9 +15,9 @@ import (
 
 	"fmt"
 
+	twistededwards "github.com/consensys/gnark-crypto/ecc/bls12-381/bandersnatch"
 	"github.com/consensys/gnark-crypto/ecc/bls12-381/fr"
 	"github.com/consensys/gnark-crypto/ecc/bls12-381/fr/mimc"
-	"github.com/consensys/gnark-crypto/ecc/bls12-381/twistededwards"
 	"github.com/consensys/gnark-crypto/hash"
 )
 
diff --git a/ecc/bls12-381/bandersnatch/eddsa/marshal.go b/ecc/bls12-381/bandersnatch/eddsa/marshal.go
index c1d9e1455..c596ba17d 100644
--- a/ecc/bls12-381/bandersnatch/eddsa/marshal.go
+++ b/ecc/bls12-381/bandersnatch/eddsa/marshal.go
@@ -11,8 +11,8 @@ import (
 	"io"
 	"math/big"
 
+	twistededwards "github.com/consensys/gnark-crypto/ecc/bls12-381/bandersnatch"
 	"github.com/consensys/gnark-crypto/ecc/bls12-381/fr"
-	"github.com/consensys/gnark-crypto/ecc/bls12-381/twistededwards"
 )
 
 // cf point.go (ugly copy)
diff --git a/internal/generator/edwards/eddsa/generate.go b/internal/generator/edwards/eddsa/generate.go
index 7a8f79cd9..eacf2da33 100644
--- a/internal/generator/edwards/eddsa/generate.go
+++ b/internal/generator/edwards/eddsa/generate.go
@@ -10,9 +10,9 @@ import (
 )
 
 func Generate(conf config.TwistedEdwardsCurve, baseDir string, gen *common.Generator) error {
-	// eddsa
-	conf.Package = "eddsa"
-	baseDir = filepath.Join(baseDir, conf.Package)
+	// eddsa; conf.Package stays the curve package ("twistededwards" or
+	// "bandersnatch") so that the templates import the curve they sign on.
+	baseDir = filepath.Join(baseDir, "eddsa")
 
 	entries := []bavard.Entry{
 		{File: filepath.Join(baseDir, "doc.go"), Templates: []string{"doc.go.tmpl"}},
@@ -21,6 +21,6 @@ func Generate(conf config.TwistedEdwardsCurve, baseDir string, gen *common.Gener
 		{File: filepath.Join(baseDir, "marshal.go"), Templates: []string{"marshal.go.tmpl"}},
 	}
 	eddsaGen := common.NewDefaultGenerator(template.FS)
-	return eddsaGen.Generate(conf, conf.Package, "", "", entries...)
+	return eddsaGen.Generate(conf, "eddsa", "", "", entries...)
 
 }
diff --git a/internal/generator/edwards/eddsa/template/doc.go.tmpl b/internal/generator/edwards/eddsa/template/doc.go.tmpl
index b2ab24e63..c80344101 100644
--- a/internal/generator/edwards/eddsa/template/doc.go.tmpl
+++ b/internal/generator/edwards/eddsa/template/doc.go.tmpl
@@ -1,6 +1,6 @@
-// Package {{.Package}} provides EdDSA signature scheme on {{.Name}}'s twisted edwards curve.
+// Package eddsa provides EdDSA signature scheme on {{.Name}}'s {{if ne .Package "twistededwards"}}{{.Package}} {{end}}twisted edwards curve.
 // 
 // See also
 //
 // https://en.wikipedia.org/wiki/EdDSA
-package {{.Package}}
\ No newline at end of file
+package eddsa
\ No newline at end of file
diff --git a/internal/generator/edwards/eddsa/template/eddsa.go.tmpl b/internal/generator/edwards/eddsa/template/eddsa.go.tmpl
index 0e0c46cb0..409d343ba 100644
--- a/internal/generator/edwards/eddsa/template/eddsa.go.tmpl
+++ b/internal/generator/edwards/eddsa/template/eddsa.go.tmpl
@@ -6,7 +6,7 @@ import (
 	"math/big"
 
 	"github.com/consensys/gnark-crypto/signature"
-	"github.com/consensys/gnark-crypto/ecc/{{.Name}}/twistededwards"
+	{{if ne .Package "twistededwards"}}twistededwards {{end}}"github.com/consensys/gnark-crypto/ecc/{{.Name}}/{{.Package}}"
 	"github.com/consensys/gnark-crypto/ecc/{{.Name}}/fr"
 	"golang.org/x/crypto/blake2b"
 )
diff --git a/internal/generator/edwards/eddsa/template/eddsa.test.go.tmpl b/internal/generator/edwards/eddsa/template/eddsa.test.go.tmpl
index 2debe93d8..cd4f97aef 100644
--- a/internal/generator/edwards/eddsa/template/eddsa.test.go.tmpl
+++ b/internal/generator/edwards/eddsa/template/eddsa.test.go.tmpl
@@ -9,7 +9,7 @@ import (
 	"fmt"
 
 	"github.com/consensys/gnark-crypto/hash"
-	"github.com/consensys/gnark-crypto/ecc/{{.Name}}/twistededwards"
+	{{if ne .Package "twistededwards"}}twistededwards {{end}}"github.com/consensys/gnark-crypto/ecc/{{.Name}}/{{.Package}}"
 	"github.com/consensys/gnark-crypto/ecc/{{.Name}}/fr"
 	"github.com/consensys/gnark-crypto/ecc/{{.Name}}/fr/mimc"
 )
diff --git a/internal/generator/edwards/eddsa/template/marshal.go.tmpl b/internal/generator/edwards/eddsa/template/marshal.go.tmpl
index 8d5674fab..4c4aa5a44 100644
--- a/internal/generator/edwards/eddsa/template/marshal.go.tmpl
+++ b/internal/generator/edwards/eddsa/template/marshal.go.tmpl
@@ -3,7 +3,7 @@ import (
 	"errors"
 	"io"
 	"math/big"
-	"github.com/consensys/gnark-crypto/ecc/{{.Name}}/twistededwards"
+	{{if ne .Package "twistededwards"}}twistededwards {{end}}"github.com/consensys/gnark-crypto/ecc/{{.Name}}/{{.Package}}"
 	"github.com/consensys/gnark-crypto/ecc/{{.Name}}/fr"
 )