diff --git a/includes/definitions/zynos.yaml b/includes/definitions/zynos.yaml
index db278f3280..c23ab7c000 100644
--- a/includes/definitions/zynos.yaml
+++ b/includes/definitions/zynos.yaml
@@ -10,3 +10,4 @@ discovery:
         - '/^ES/'
         - '/^GS/'
         - '/^MES/'
+        - '/^XS/'
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index 1f2621042a..a985b80f26 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -1586,6 +1586,7 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('zynos', 'zynos-es');
         $this->checkOS('zynos', 'zynos-gs');
         $this->checkOS('zynos', 'zynos-mes3528');
+        $this->checkOS('zynos', 'zynos-xs');
     }
 
     public function testZywall()
diff --git a/tests/snmpsim/zynos-xs.snmprec b/tests/snmpsim/zynos-xs.snmprec
new file mode 100644
index 0000000000..fecdf58ea2
--- /dev/null
+++ b/tests/snmpsim/zynos-xs.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|XS3700-24
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.890.1.15