diff --git a/src/XML/ds/AbstractDSAKeyValueType.php b/src/XML/ds/AbstractDSAKeyValueType.php
new file mode 100644
index 00000000..becfd5c4
--- /dev/null
+++ b/src/XML/ds/AbstractDSAKeyValueType.php
@@ -0,0 +1,206 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\XML\ds;
+
+use DOMElement;
+use SimpleSAML\Assert\Assert;
+use SimpleSAML\XML\Exception\InvalidDOMElementException;
+use SimpleSAML\XML\Exception\SchemaViolationException;
+use SimpleSAML\XML\Exception\TooManyElementsException;
+
+use function array_pop;
+
+/**
+ * A class implementing the ds:AbstractDSAKeyValueType element.
+ *
+ * @package simplesamlphp/xml-security
+ */
+abstract class AbstractDSAKeyValueType extends AbstractDsElement
+{
+    /**
+     * DSAKeyValueType constructor.
+     *
+     * @param \SimpleSAML\XMLSecurity\XML\ds\Y $y
+     * @param \SimpleSAML\XMLSecurity\XML\ds\G|null $g
+     * @param \SimpleSAML\XMLSecurity\XML\ds\J|null $j
+     * @param \SimpleSAML\XMLSecurity\XML\ds\P|null $p
+     * @param \SimpleSAML\XMLSecurity\XML\ds\Q|null $q
+     * @param \SimpleSAML\XMLSecurity\XML\ds\Generator|null $generator
+     * @param \SimpleSAML\XMLSecurity\XML\ds\Seed|null $seed
+     * @param \SimpleSAML\XMLSecurity\XML\ds\PgenCounter|null $pgenCounter
+     */
+    final public function __construct(
+        protected Y $y,
+        protected ?G $g = null,
+        protected ?J $j = null,
+        protected ?P $p = null,
+        protected ?Q $q = null,
+        protected ?Seed $seed = null,
+        protected ?PgenCounter $pgenCounter = null,
+    ) {
+        if ($p !== null || $q !== null) {
+            Assert::allNotNull([$p, $q], SchemaViolationException::class);
+        } else {
+            Assert::allNull([$p, $q], SchemaViolationException::class);
+        }
+
+        if ($seed !== null || $pgenCounter !== null) {
+            Assert::allNotNull([$seed, $pgenCounter], SchemaViolationException::class);
+        } else {
+            Assert::allNull([$seed, $pgenCounter], SchemaViolationException::class);
+        }
+    }
+
+
+    /**
+     * Get the Y.
+     *
+     * @return \SimpleSAML\XMLSecurity\XML\ds\Y
+     */
+    public function getY(): Y
+    {
+        return $this->y;
+    }
+
+
+    /**
+     * Get the G.
+     *
+     * @return \SimpleSAML\XMLSecurity\XML\ds\G
+     */
+    public function getG(): G
+    {
+        return $this->g;
+    }
+
+
+    /**
+     * Get the J.
+     *
+     * @return \SimpleSAML\XMLSecurity\XML\ds\J
+     */
+    public function getJ(): J
+    {
+        return $this->j;
+    }
+
+
+    /**
+     * Get the P.
+     *
+     * @return \SimpleSAML\XMLSecurity\XML\ds\P|null
+     */
+    public function getP(): ?P
+    {
+        return $this->p;
+    }
+
+
+    /**
+     * Get the Q.
+     *
+     * @return \SimpleSAML\XMLSecurity\XML\ds\Q|null
+     */
+    public function getQ(): ?Q
+    {
+        return $this->q;
+    }
+
+
+    /**
+     * Get the Seed.
+     *
+     * @return \SimpleSAML\XMLSecurity\XML\ds\Seed|null
+     */
+    public function getSeed(): ?Seed
+    {
+        return $this->seed;
+    }
+
+
+    /**
+     * Get the PgenCounter.
+     *
+     * @return \SimpleSAML\XMLSecurity\XML\ds\PgenCounter|null
+     */
+    public function getPgenCounter(): ?PgenCounter
+    {
+        return $this->pgenCounter;
+    }
+
+
+    /**
+     * Initialize an DSAKeyValue object from an existing XML.
+     *
+     * @param \DOMElement $xml
+     * @return static
+     *
+     * @throws \SimpleSAML\XML\Exception\InvalidDOMElementException
+     *   if the qualified name of the supplied element is wrong
+     * @throws \SimpleSAML\XML\Exception\MissingAttributeException
+     *   if the supplied element is missing one of the mandatory attributes
+     * @throws \SimpleSAML\XML\Exception\TooManyElementsException
+     *   if too many child-elements of a type are specified
+     */
+    public static function fromXML(DOMElement $xml): static
+    {
+        Assert::same($xml->localName, 'DSAKeyValue', InvalidDOMElementException::class);
+        Assert::same($xml->namespaceURI, static::NS, InvalidDOMElementException::class);
+
+        $y = Y::getChildrenOfClass($xml);
+        Assert::minCount($y, 1, TooManyElementsException::class);
+        Assert::maxCount($y, 1, TooManyElementsException::class);
+
+        $g = G::getChildrenOfClass($xml);
+        Assert::maxCount($g, 1, TooManyElementsException::class);
+
+        $j = J::getChildrenOfClass($xml);
+        Assert::maxCount($j, 1, TooManyElementsException::class);
+
+        $p = P::getChildrenOfClass($xml);
+        Assert::maxCount($p, 1, TooManyElementsException::class);
+
+        $q = Q::getChildrenOfClass($xml);
+        Assert::maxCount($q, 1, TooManyElementsException::class);
+
+        $seed = Seed::getChildrenOfClass($xml);
+        Assert::maxCount($seed, 1, TooManyElementsException::class);
+
+        $pgenCounter = PgenCounter::getChildrenOfClass($xml);
+        Assert::maxCount($pgenCounter, 1, TooManyElementsException::class);
+
+        return new static(
+            array_pop($y),
+            array_pop($g),
+            array_pop($j),
+            array_pop($p),
+            array_pop($q),
+            array_pop($seed),
+            array_pop($pgenCounter),
+        );
+    }
+
+
+    /**
+     * Convert this DSAKeyValue object to XML.
+     *
+     * @param \DOMElement|null $parent The element we should append this DSAKeyValue to.
+     * @return \DOMElement
+     */
+    public function toXML(?DOMElement $parent = null): DOMElement
+    {
+        $e = $this->instantiateParentElement($parent);
+
+        $this->getP()?->toXML($e);
+        $this->getQ()?->toXML($e);
+        $this->getG()?->toXML($e);
+        $this->getY()->toXML($e);
+        $this->getJ()?->toXML($e);
+        $this->getSeed()?->toXML($e);
+        $this->getPgenCounter()?->toXML($e);
+
+        return $e;
+    }
+}
diff --git a/src/XML/ds/DSAKeyValue.php b/src/XML/ds/DSAKeyValue.php
new file mode 100644
index 00000000..38d347c4
--- /dev/null
+++ b/src/XML/ds/DSAKeyValue.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\XML\ds;
+
+/**
+ * Class representing a ds:DSAKeyValue element.
+ *
+ * @package simplesaml/xml-security
+ */
+final class DSAKeyValue extends AbstractDSAKeyValueType
+{
+}
diff --git a/src/XML/ds/G.php b/src/XML/ds/G.php
new file mode 100644
index 00000000..0e879816
--- /dev/null
+++ b/src/XML/ds/G.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\XML\ds;
+
+use SimpleSAML\XML\Base64ElementTrait;
+
+/**
+ * Class representing a ds:G element.
+ *
+ * @package simplesaml/xml-security
+ */
+final class G extends AbstractDsElement
+{
+    use Base64ElementTrait;
+
+
+    /**
+     * @param string $content
+     */
+    public function __construct(string $content)
+    {
+        $this->setContent($content);
+    }
+}
diff --git a/src/XML/ds/J.php b/src/XML/ds/J.php
new file mode 100644
index 00000000..22e724c3
--- /dev/null
+++ b/src/XML/ds/J.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\XML\ds;
+
+use SimpleSAML\XML\Base64ElementTrait;
+
+/**
+ * Class representing a ds:J element.
+ *
+ * @package simplesaml/xml-security
+ */
+final class J extends AbstractDsElement
+{
+    use Base64ElementTrait;
+
+
+    /**
+     * @param string $content
+     */
+    public function __construct(string $content)
+    {
+        $this->setContent($content);
+    }
+}
diff --git a/src/XML/ds/P.php b/src/XML/ds/P.php
new file mode 100644
index 00000000..a5173b4c
--- /dev/null
+++ b/src/XML/ds/P.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\XML\ds;
+
+use SimpleSAML\XML\Base64ElementTrait;
+
+/**
+ * Class representing a ds:P element.
+ *
+ * @package simplesaml/xml-security
+ */
+final class P extends AbstractDsElement
+{
+    use Base64ElementTrait;
+
+
+    /**
+     * @param string $content
+     */
+    public function __construct(string $content)
+    {
+        $this->setContent($content);
+    }
+}
diff --git a/src/XML/ds/PgenCounter.php b/src/XML/ds/PgenCounter.php
new file mode 100644
index 00000000..9210d1b8
--- /dev/null
+++ b/src/XML/ds/PgenCounter.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\XML\ds;
+
+use SimpleSAML\XML\Base64ElementTrait;
+
+/**
+ * Class representing a ds:PgenCounter element.
+ *
+ * @package simplesaml/xml-security
+ */
+final class PgenCounter extends AbstractDsElement
+{
+    use Base64ElementTrait;
+
+
+    /**
+     * @param string $content
+     */
+    public function __construct(string $content)
+    {
+        $this->setContent($content);
+    }
+}
diff --git a/src/XML/ds/Q.php b/src/XML/ds/Q.php
new file mode 100644
index 00000000..3089f707
--- /dev/null
+++ b/src/XML/ds/Q.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\XML\ds;
+
+use SimpleSAML\XML\Base64ElementTrait;
+
+/**
+ * Class representing a ds:Q element.
+ *
+ * @package simplesaml/xml-security
+ */
+final class Q extends AbstractDsElement
+{
+    use Base64ElementTrait;
+
+
+    /**
+     * @param string $content
+     */
+    public function __construct(string $content)
+    {
+        $this->setContent($content);
+    }
+}
diff --git a/src/XML/ds/Seed.php b/src/XML/ds/Seed.php
new file mode 100644
index 00000000..cf0713c9
--- /dev/null
+++ b/src/XML/ds/Seed.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\XML\ds;
+
+use SimpleSAML\XML\Base64ElementTrait;
+
+/**
+ * Class representing a ds:seed element.
+ *
+ * @package simplesaml/xml-security
+ */
+final class Seed extends AbstractDsElement
+{
+    use Base64ElementTrait;
+
+
+    /**
+     * @param string $content
+     */
+    public function __construct(string $content)
+    {
+        $this->setContent($content);
+    }
+}
diff --git a/src/XML/ds/Y.php b/src/XML/ds/Y.php
new file mode 100644
index 00000000..2d8b7daf
--- /dev/null
+++ b/src/XML/ds/Y.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\XML\ds;
+
+use SimpleSAML\XML\Base64ElementTrait;
+
+/**
+ * Class representing a ds:Y element.
+ *
+ * @package simplesaml/xml-security
+ */
+final class Y extends AbstractDsElement
+{
+    use Base64ElementTrait;
+
+
+    /**
+     * @param string $content
+     */
+    public function __construct(string $content)
+    {
+        $this->setContent($content);
+    }
+}
diff --git a/tests/XML/ds/DSAKeyValueTest.php b/tests/XML/ds/DSAKeyValueTest.php
new file mode 100644
index 00000000..17ffefa3
--- /dev/null
+++ b/tests/XML/ds/DSAKeyValueTest.php
@@ -0,0 +1,100 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\Test\XML\ds;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\TestCase;
+use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
+use SimpleSAML\XMLSecurity\XML\ds\AbstractDSAKeyValueType;
+use SimpleSAML\XMLSecurity\XML\ds\AbstractDsElement;
+use SimpleSAML\XMLSecurity\XML\ds\DSAKeyValue;
+use SimpleSAML\XMLSecurity\XML\ds\G;
+use SimpleSAML\XMLSecurity\XML\ds\J;
+use SimpleSAML\XMLSecurity\XML\ds\P;
+use SimpleSAML\XMLSecurity\XML\ds\PgenCounter;
+use SimpleSAML\XMLSecurity\XML\ds\Q;
+use SimpleSAML\XMLSecurity\XML\ds\Seed;
+use SimpleSAML\XMLSecurity\XML\ds\Y;
+
+use function dirname;
+use function strval;
+
+/**
+ * Class \SimpleSAML\XMLSecurity\Test\XML\ds\DSAKeyValueTest
+ *
+ * @package simplesamlphp/xml-security
+ */
+#[CoversClass(AbstractDsElement::class)]
+#[CoversClass(AbstractDSAKeyValueType::class)]
+#[CoversClass(DSAKeyValue::class)]
+final class DSAKeyValueTest extends TestCase
+{
+    use SchemaValidationTestTrait;
+    use SerializableElementTestTrait;
+
+    /**
+     */
+    public static function setUpBeforeClass(): void
+    {
+        self::$testedClass = DSAKeyValue::class;
+
+        self::$schemaFile = dirname(__FILE__, 4) . '/resources/schemas/xmldsig1-schema.xsd';
+
+        self::$xmlRepresentation = DOMDocumentFactory::fromFile(
+            dirname(__FILE__, 3) . '/resources/xml/ds_DSAKeyValue.xml',
+        );
+    }
+
+
+    /**
+     */
+    public function testMarshalling(): void
+    {
+        $p = new P('GpM1');
+        $q = new Q('GpM2');
+        $g = new G('GpM3');
+        $y = new Y('GpM4');
+        $j = new J('GpM5');
+        $seed = new Seed('GpM6');
+        $pgenCounter = new PgenCounter('GpM7');
+
+        $dsaKeyValue = new DSAKeyValue($y, $g, $j, $p, $q, $seed, $pgenCounter);
+
+        $this->assertEquals(
+            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
+            strval($dsaKeyValue),
+        );
+    }
+
+
+    /**
+     */
+    public function testMarshallingElementOrder(): void
+    {
+        $p = new P('GpM1');
+        $q = new Q('GpM2');
+        $g = new G('GpM3');
+        $y = new Y('GpM4');
+        $j = new J('GpM5');
+        $seed = new Seed('GpM6');
+        $pgenCounter = new PgenCounter('GpM7');
+
+        $dsaKeyValue = new DSAKeyValue($y, $g, $j, $p, $q, $seed, $pgenCounter);
+
+        $dsaKeyValueElement = $dsaKeyValue->toXML();
+        /** @var \DOMElement[] $children */
+        $children = $dsaKeyValueElement->childNodes;
+
+        $this->assertEquals('ds:P', $children[0]->tagName);
+        $this->assertEquals('ds:Q', $children[1]->tagName);
+        $this->assertEquals('ds:G', $children[2]->tagName);
+        $this->assertEquals('ds:Y', $children[3]->tagName);
+        $this->assertEquals('ds:J', $children[4]->tagName);
+        $this->assertEquals('ds:Seed', $children[5]->tagName);
+        $this->assertEquals('ds:PgenCounter', $children[6]->tagName);
+    }
+}
diff --git a/tests/XML/ds/GTest.php b/tests/XML/ds/GTest.php
new file mode 100644
index 00000000..3c82fce4
--- /dev/null
+++ b/tests/XML/ds/GTest.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\Test\XML\ds;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\TestCase;
+use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
+use SimpleSAML\XMLSecurity\XML\ds\AbstractDsElement;
+use SimpleSAML\XMLSecurity\XML\ds\G;
+
+use function dirname;
+use function strval;
+
+/**
+ * Class \SimpleSAML\XMLSecurity\Test\XML\ds\GTest
+ *
+ * @package simplesamlphp/xml-security
+ */
+#[CoversClass(AbstractDsElement::class)]
+#[CoversClass(G::class)]
+final class GTest extends TestCase
+{
+    use SerializableElementTestTrait;
+
+    /**
+     */
+    public static function setUpBeforeClass(): void
+    {
+        self::$testedClass = G::class;
+
+        self::$xmlRepresentation = DOMDocumentFactory::fromFile(
+            dirname(__FILE__, 3) . '/resources/xml/ds_G.xml',
+        );
+    }
+
+
+    /**
+     */
+    public function testMarshalling(): void
+    {
+        $g = new G('GpM6');
+
+        $this->assertEquals(
+            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
+            strval($g),
+        );
+    }
+}
diff --git a/tests/XML/ds/JTest.php b/tests/XML/ds/JTest.php
new file mode 100644
index 00000000..0dfe7076
--- /dev/null
+++ b/tests/XML/ds/JTest.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\Test\XML\ds;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\TestCase;
+use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
+use SimpleSAML\XMLSecurity\XML\ds\AbstractDsElement;
+use SimpleSAML\XMLSecurity\XML\ds\J;
+
+use function dirname;
+use function strval;
+
+/**
+ * Class \SimpleSAML\XMLSecurity\Test\XML\ds\JTest
+ *
+ * @package simplesamlphp/xml-security
+ */
+#[CoversClass(AbstractDsElement::class)]
+#[CoversClass(J::class)]
+final class JTest extends TestCase
+{
+    use SerializableElementTestTrait;
+
+    /**
+     */
+    public static function setUpBeforeClass(): void
+    {
+        self::$testedClass = J::class;
+
+        self::$xmlRepresentation = DOMDocumentFactory::fromFile(
+            dirname(__FILE__, 3) . '/resources/xml/ds_J.xml',
+        );
+    }
+
+
+    /**
+     */
+    public function testMarshalling(): void
+    {
+        $j = new J('GpM6');
+
+        $this->assertEquals(
+            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
+            strval($j),
+        );
+    }
+}
diff --git a/tests/XML/ds/PTest.php b/tests/XML/ds/PTest.php
new file mode 100644
index 00000000..ecb1091c
--- /dev/null
+++ b/tests/XML/ds/PTest.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\Test\XML\ds;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\TestCase;
+use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
+use SimpleSAML\XMLSecurity\XML\ds\AbstractDsElement;
+use SimpleSAML\XMLSecurity\XML\ds\P;
+
+use function dirname;
+use function strval;
+
+/**
+ * Class \SimpleSAML\XMLSecurity\Test\XML\ds\PTest
+ *
+ * @package simplesamlphp/xml-security
+ */
+#[CoversClass(AbstractDsElement::class)]
+#[CoversClass(P::class)]
+final class PTest extends TestCase
+{
+    use SerializableElementTestTrait;
+
+    /**
+     */
+    public static function setUpBeforeClass(): void
+    {
+        self::$testedClass = P::class;
+
+        self::$xmlRepresentation = DOMDocumentFactory::fromFile(
+            dirname(__FILE__, 3) . '/resources/xml/ds_P.xml',
+        );
+    }
+
+
+    /**
+     */
+    public function testMarshalling(): void
+    {
+        $p = new P('GpM6');
+
+        $this->assertEquals(
+            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
+            strval($p),
+        );
+    }
+}
diff --git a/tests/XML/ds/PgenCounterTest.php b/tests/XML/ds/PgenCounterTest.php
new file mode 100644
index 00000000..09178b72
--- /dev/null
+++ b/tests/XML/ds/PgenCounterTest.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\Test\XML\ds;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\TestCase;
+use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
+use SimpleSAML\XMLSecurity\XML\ds\AbstractDsElement;
+use SimpleSAML\XMLSecurity\XML\ds\PgenCounter;
+
+use function dirname;
+use function strval;
+
+/**
+ * Class \SimpleSAML\XMLSecurity\Test\XML\ds\PgenCounterTest
+ *
+ * @package simplesamlphp/xml-security
+ */
+#[CoversClass(AbstractDsElement::class)]
+#[CoversClass(PgenCounter::class)]
+final class PgenCounterTest extends TestCase
+{
+    use SerializableElementTestTrait;
+
+    /**
+     */
+    public static function setUpBeforeClass(): void
+    {
+        self::$testedClass = PgenCounter::class;
+
+        self::$xmlRepresentation = DOMDocumentFactory::fromFile(
+            dirname(__FILE__, 3) . '/resources/xml/ds_PgenCounter.xml',
+        );
+    }
+
+
+    /**
+     */
+    public function testMarshalling(): void
+    {
+        $pgenCounter = new PgenCounter('GpM6');
+
+        $this->assertEquals(
+            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
+            strval($pgenCounter),
+        );
+    }
+}
diff --git a/tests/XML/ds/QTest.php b/tests/XML/ds/QTest.php
new file mode 100644
index 00000000..aace3a99
--- /dev/null
+++ b/tests/XML/ds/QTest.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\Test\XML\ds;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\TestCase;
+use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
+use SimpleSAML\XMLSecurity\XML\ds\AbstractDsElement;
+use SimpleSAML\XMLSecurity\XML\ds\Q;
+
+use function dirname;
+use function strval;
+
+/**
+ * Class \SimpleSAML\XMLSecurity\Test\XML\ds\QTest
+ *
+ * @package simplesamlphp/xml-security
+ */
+#[CoversClass(AbstractDsElement::class)]
+#[CoversClass(Q::class)]
+final class QTest extends TestCase
+{
+    use SerializableElementTestTrait;
+
+    /**
+     */
+    public static function setUpBeforeClass(): void
+    {
+        self::$testedClass = Q::class;
+
+        self::$xmlRepresentation = DOMDocumentFactory::fromFile(
+            dirname(__FILE__, 3) . '/resources/xml/ds_Q.xml',
+        );
+    }
+
+
+    /**
+     */
+    public function testMarshalling(): void
+    {
+        $q = new Q('GpM6');
+
+        $this->assertEquals(
+            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
+            strval($q),
+        );
+    }
+}
diff --git a/tests/XML/ds/SeedTest.php b/tests/XML/ds/SeedTest.php
new file mode 100644
index 00000000..f6ded14b
--- /dev/null
+++ b/tests/XML/ds/SeedTest.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\Test\XML\ds;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\TestCase;
+use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
+use SimpleSAML\XMLSecurity\XML\ds\AbstractDsElement;
+use SimpleSAML\XMLSecurity\XML\ds\Seed;
+
+use function dirname;
+use function strval;
+
+/**
+ * Class \SimpleSAML\XMLSecurity\Test\XML\ds\SeedTest
+ *
+ * @package simplesamlphp/xml-security
+ */
+#[CoversClass(AbstractDsElement::class)]
+#[CoversClass(Seed::class)]
+final class SeedTest extends TestCase
+{
+    use SerializableElementTestTrait;
+
+    /**
+     */
+    public static function setUpBeforeClass(): void
+    {
+        self::$testedClass = Seed::class;
+
+        self::$xmlRepresentation = DOMDocumentFactory::fromFile(
+            dirname(__FILE__, 3) . '/resources/xml/ds_Seed.xml',
+        );
+    }
+
+
+    /**
+     */
+    public function testMarshalling(): void
+    {
+        $seed = new Seed('GpM6');
+
+        $this->assertEquals(
+            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
+            strval($seed),
+        );
+    }
+}
diff --git a/tests/XML/ds/YTest.php b/tests/XML/ds/YTest.php
new file mode 100644
index 00000000..a1417763
--- /dev/null
+++ b/tests/XML/ds/YTest.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\XMLSecurity\Test\XML\ds;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\TestCase;
+use SimpleSAML\XML\DOMDocumentFactory;
+use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
+use SimpleSAML\XMLSecurity\XML\ds\AbstractDsElement;
+use SimpleSAML\XMLSecurity\XML\ds\Y;
+
+use function dirname;
+use function strval;
+
+/**
+ * Class \SimpleSAML\XMLSecurity\Test\XML\ds\YTest
+ *
+ * @package simplesamlphp/xml-security
+ */
+#[CoversClass(AbstractDsElement::class)]
+#[CoversClass(Y::class)]
+final class YTest extends TestCase
+{
+    use SerializableElementTestTrait;
+
+    /**
+     */
+    public static function setUpBeforeClass(): void
+    {
+        self::$testedClass = Y::class;
+
+        self::$xmlRepresentation = DOMDocumentFactory::fromFile(
+            dirname(__FILE__, 3) . '/resources/xml/ds_Y.xml',
+        );
+    }
+
+
+    /**
+     */
+    public function testMarshalling(): void
+    {
+        $y = new Y('GpM6');
+
+        $this->assertEquals(
+            self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),
+            strval($y),
+        );
+    }
+}
diff --git a/tests/resources/xml/ds_DSAKeyValue.xml b/tests/resources/xml/ds_DSAKeyValue.xml
new file mode 100644
index 00000000..3b16168c
--- /dev/null
+++ b/tests/resources/xml/ds_DSAKeyValue.xml
@@ -0,0 +1,9 @@
+<ds:DSAKeyValue xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+  <ds:P>GpM1</ds:P>
+  <ds:Q>GpM2</ds:Q>
+  <ds:G>GpM3</ds:G>
+  <ds:Y>GpM4</ds:Y>
+  <ds:J>GpM5</ds:J>
+  <ds:Seed>GpM6</ds:Seed>
+  <ds:PgenCounter>GpM7</ds:PgenCounter>
+</ds:DSAKeyValue>
diff --git a/tests/resources/xml/ds_G.xml b/tests/resources/xml/ds_G.xml
new file mode 100644
index 00000000..da043e98
--- /dev/null
+++ b/tests/resources/xml/ds_G.xml
@@ -0,0 +1 @@
+<ds:G xmlns:ds="http://www.w3.org/2000/09/xmldsig#">GpM6</ds:G>
diff --git a/tests/resources/xml/ds_J.xml b/tests/resources/xml/ds_J.xml
new file mode 100644
index 00000000..f37e0756
--- /dev/null
+++ b/tests/resources/xml/ds_J.xml
@@ -0,0 +1 @@
+<ds:J xmlns:ds="http://www.w3.org/2000/09/xmldsig#">GpM6</ds:J>
diff --git a/tests/resources/xml/ds_P.xml b/tests/resources/xml/ds_P.xml
new file mode 100644
index 00000000..e61189b9
--- /dev/null
+++ b/tests/resources/xml/ds_P.xml
@@ -0,0 +1 @@
+<ds:P xmlns:ds="http://www.w3.org/2000/09/xmldsig#">GpM6</ds:P>
diff --git a/tests/resources/xml/ds_PgenCounter.xml b/tests/resources/xml/ds_PgenCounter.xml
new file mode 100644
index 00000000..6b0dda66
--- /dev/null
+++ b/tests/resources/xml/ds_PgenCounter.xml
@@ -0,0 +1 @@
+<ds:PgenCounter xmlns:ds="http://www.w3.org/2000/09/xmldsig#">GpM6</ds:PgenCounter>
diff --git a/tests/resources/xml/ds_Q.xml b/tests/resources/xml/ds_Q.xml
new file mode 100644
index 00000000..5f388348
--- /dev/null
+++ b/tests/resources/xml/ds_Q.xml
@@ -0,0 +1 @@
+<ds:Q xmlns:ds="http://www.w3.org/2000/09/xmldsig#">GpM6</ds:Q>
diff --git a/tests/resources/xml/ds_Seed.xml b/tests/resources/xml/ds_Seed.xml
new file mode 100644
index 00000000..6aa6c0fa
--- /dev/null
+++ b/tests/resources/xml/ds_Seed.xml
@@ -0,0 +1 @@
+<ds:Seed xmlns:ds="http://www.w3.org/2000/09/xmldsig#">GpM6</ds:Seed>
diff --git a/tests/resources/xml/ds_Y.xml b/tests/resources/xml/ds_Y.xml
new file mode 100644
index 00000000..3fae3718
--- /dev/null
+++ b/tests/resources/xml/ds_Y.xml
@@ -0,0 +1 @@
+<ds:Y xmlns:ds="http://www.w3.org/2000/09/xmldsig#">GpM6</ds:Y>