diff --git a/composer.json b/composer.json
index 6ebc599..ce9829b 100644
--- a/composer.json
+++ b/composer.json
@@ -13,11 +13,11 @@
         "ext-dom": "*",
         "ext-spl": "*",
 
-        "simplesamlphp/assert": "~1.7.0",
-        "simplesamlphp/xml-common": "~1.23.2"
+        "simplesamlphp/assert": "~1.8.0",
+        "simplesamlphp/xml-common": "~1.24.0"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "^1.7"
+        "simplesamlphp/simplesamlphp-test-framework": "~1.8.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Assert/Assert.php b/src/Assert/Assert.php
new file mode 100644
index 0000000..0f15455
--- /dev/null
+++ b/src/Assert/Assert.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\WSDL\Assert;
+
+use SimpleSAML\XML\Assert\Assert as BaseAssert;
+
+/**
+ * SimpleSAML\WSDL\Assert\Assert wrapper class
+ *
+ * @package simplesamlphp/xml-wsdl
+ */
+class Assert extends BaseAssert
+{
+}
diff --git a/src/XML/soap12/AbstractHeaderFault.php b/src/XML/soap12/AbstractHeaderFault.php
index 24d387c..d94c768 100644
--- a/src/XML/soap12/AbstractHeaderFault.php
+++ b/src/XML/soap12/AbstractHeaderFault.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSDL\XML\soap12;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSSecurity\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 
diff --git a/src/XML/wsdl/AbstractBinding.php b/src/XML/wsdl/AbstractBinding.php
index b8dfaae..7bfed4d 100644
--- a/src/XML/wsdl/AbstractBinding.php
+++ b/src/XML/wsdl/AbstractBinding.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSDL\XML\wsdl;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSDL\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 
 /**
diff --git a/src/XML/wsdl/AbstractBindingOperation.php b/src/XML/wsdl/AbstractBindingOperation.php
index 694ca2d..0740d34 100644
--- a/src/XML/wsdl/AbstractBindingOperation.php
+++ b/src/XML/wsdl/AbstractBindingOperation.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSDL\XML\wsdl;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSDL\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 
 /**
diff --git a/src/XML/wsdl/AbstractBindingOperationFault.php b/src/XML/wsdl/AbstractBindingOperationFault.php
index 092b6e3..261c21a 100644
--- a/src/XML/wsdl/AbstractBindingOperationFault.php
+++ b/src/XML/wsdl/AbstractBindingOperationFault.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSDL\XML\wsdl;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSDL\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 
 /**
diff --git a/src/XML/wsdl/AbstractBindingOperationMessage.php b/src/XML/wsdl/AbstractBindingOperationMessage.php
index 23cec22..8561caf 100644
--- a/src/XML/wsdl/AbstractBindingOperationMessage.php
+++ b/src/XML/wsdl/AbstractBindingOperationMessage.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSDL\XML\wsdl;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSDL\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 
 /**
diff --git a/src/XML/wsdl/AbstractDefinitions.php b/src/XML/wsdl/AbstractDefinitions.php
index 63d1670..12377be 100644
--- a/src/XML/wsdl/AbstractDefinitions.php
+++ b/src/XML/wsdl/AbstractDefinitions.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSDL\XML\wsdl;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSDL\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 
 use function array_map;
diff --git a/src/XML/wsdl/AbstractFault.php b/src/XML/wsdl/AbstractFault.php
index 08a90c4..fa1979a 100644
--- a/src/XML/wsdl/AbstractFault.php
+++ b/src/XML/wsdl/AbstractFault.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSDL\XML\wsdl;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSDL\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 
 /**
diff --git a/src/XML/wsdl/AbstractMessage.php b/src/XML/wsdl/AbstractMessage.php
index 7efd389..606a89c 100644
--- a/src/XML/wsdl/AbstractMessage.php
+++ b/src/XML/wsdl/AbstractMessage.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSDL\XML\wsdl;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSDL\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 
 use function array_map;
diff --git a/src/XML/wsdl/AbstractParam.php b/src/XML/wsdl/AbstractParam.php
index 3dd63e9..822512b 100644
--- a/src/XML/wsdl/AbstractParam.php
+++ b/src/XML/wsdl/AbstractParam.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSDL\XML\wsdl;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSDL\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 
 /**
diff --git a/src/XML/wsdl/AbstractPart.php b/src/XML/wsdl/AbstractPart.php
index a123f82..94d6167 100644
--- a/src/XML/wsdl/AbstractPart.php
+++ b/src/XML/wsdl/AbstractPart.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSDL\XML\wsdl;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSDL\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 
 /**
diff --git a/src/XML/wsdl/AbstractPort.php b/src/XML/wsdl/AbstractPort.php
index 4d612f9..469020f 100644
--- a/src/XML/wsdl/AbstractPort.php
+++ b/src/XML/wsdl/AbstractPort.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSDL\XML\wsdl;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSDL\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 
 /**
diff --git a/src/XML/wsdl/AbstractPortType.php b/src/XML/wsdl/AbstractPortType.php
index 8a95034..184cfcd 100644
--- a/src/XML/wsdl/AbstractPortType.php
+++ b/src/XML/wsdl/AbstractPortType.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSDL\XML\wsdl;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSDL\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 
 /**
diff --git a/src/XML/wsdl/AbstractPortTypeOperation.php b/src/XML/wsdl/AbstractPortTypeOperation.php
index 15242c5..5823524 100644
--- a/src/XML/wsdl/AbstractPortTypeOperation.php
+++ b/src/XML/wsdl/AbstractPortTypeOperation.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSDL\XML\wsdl;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSDL\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 
 use function explode;
diff --git a/src/XML/wsdl/AbstractService.php b/src/XML/wsdl/AbstractService.php
index 42d1ce2..c436e89 100644
--- a/src/XML/wsdl/AbstractService.php
+++ b/src/XML/wsdl/AbstractService.php
@@ -5,7 +5,7 @@
 namespace SimpleSAML\WSDL\XML\wsdl;
 
 use DOMElement;
-use SimpleSAML\Assert\Assert;
+use SimpleSAML\WSDL\Assert\Assert;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 
 use function array_map;