diff --git a/includes/discovery/os/timos.inc.php b/includes/discovery/os/timos.inc.php
index 084c4374ed..8cb25f0b99 100644
--- a/includes/discovery/os/timos.inc.php
+++ b/includes/discovery/os/timos.inc.php
@@ -3,6 +3,8 @@
 if (starts_with($sysObjectId, array(
     '.1.3.6.1.4.1.6527.1.3',
     '.1.3.6.1.4.1.6527.6.2.1.2.2.',
+    '.1.3.6.1.4.1.6527.6.2.1.2.6.',
+    '.1.3.6.1.4.1.6527.6.2.1.2.8.',
     '.1.3.6.1.4.1.6527.1.6.1',
     '.1.3.6.1.4.1.6527.6.1.1.2.',
     '.1.3.6.1.4.1.6527.1.9.1',
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index e05418b016..28753c403a 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -1306,6 +1306,8 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('timos', 'timos3');
         $this->checkOS('timos', 'timos4');
         $this->checkOS('timos', 'timos5');
+        $this->checkOS('timos', 'timos6');
+        $this->checkOS('timos', 'timos7');
     }
 
     public function testTpconductor()
diff --git a/tests/snmpsim/timos6.snmprec b/tests/snmpsim/timos6.snmprec
new file mode 100644
index 0000000000..3cfabf6b0d
--- /dev/null
+++ b/tests/snmpsim/timos6.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Alcatel-Lucent OS6850-U24X 6.4.3.520.R01 GA, April 08, 2010
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6527.6.2.1.2.6.
diff --git a/tests/snmpsim/timos7.snmprec b/tests/snmpsim/timos7.snmprec
new file mode 100644
index 0000000000..dcac81cdfd
--- /dev/null
+++ b/tests/snmpsim/timos7.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Alcatel-Lucent OS6850-U24X 6.4.3.520.R01 GA, April 08, 2010
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6527.6.2.1.2.8.