diff --git a/sa/profiles/Juniper/JUNOS/get_capabilities.py b/sa/profiles/Juniper/JUNOS/get_capabilities.py
index e73930a3aaf27e07e54e5dbb2a56ac76335e74f8..0766c9d48e9237568c7f4e120e02526b0f2c9771 100644
--- a/sa/profiles/Juniper/JUNOS/get_capabilities.py
+++ b/sa/profiles/Juniper/JUNOS/get_capabilities.py
@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------
 # Juniper.JUNOS.get_capabilities
 # ---------------------------------------------------------------------
-# Copyright (C) 2007-2019 The NOC Project
+# Copyright (C) 2007-2021 The NOC Project
 # See LICENSE for details
 # ---------------------------------------------------------------------
 
@@ -94,7 +94,7 @@ class Script(BaseScript):
         i = 0
         v = self.scripts.get_sla_probes()
         for p in v:
-            i += len(p["tests"])
+            i += 1
         return i
 
     def execute_platform_cli(self, caps):
diff --git a/sa/profiles/Juniper/JUNOS/get_sla_probes.py b/sa/profiles/Juniper/JUNOS/get_sla_probes.py
index b5a440c69fe6df9f82c426b9580f6f8cf9ed1c85..30c2a3b34c9bce500f430093374a15353bb25e29 100644
--- a/sa/profiles/Juniper/JUNOS/get_sla_probes.py
+++ b/sa/profiles/Juniper/JUNOS/get_sla_probes.py
@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------
 # Juniper.JUNOS.get_sla_probes
 # ---------------------------------------------------------------------
-# Copyright (C) 2007-2018 The NOC Project
+# Copyright (C) 2007-2021 The NOC Project
 # See LICENSE for details
 # ---------------------------------------------------------------------
 
@@ -19,7 +19,7 @@ class Script(BaseScript):
 
     rx_res = re.compile(
         r"^\s+Owner: (?P<owner>\S+), Test: (?P<test>\S+)\s*\n"
-        r"^\s+Target address: (?P<target>\S+), Probe type: (?P<type>\S+)(,|\n)"
+        r"^\s+Target address: (?P<target>\S+), Probe type: (?P<type>\S+)(,|, Icmp-id: \d+,|\n)"
         r"(^\s+Routing Instance Name: \S+\s*\n)?"
         r"\s+Test size: \d+ probes\s*\n"
         r"^\s+Probe results:\s*\n"
@@ -32,7 +32,10 @@ class Script(BaseScript):
         "icmp-ping-timestamp": "icmp-echo",
         "icmp6-ping": "icmp-echo",
         "udp-ping": "udp-echo",
+        "udp-ping-timestanp": "udp-echo",
+        "tcp-ping": "tcp-connect",
         "http-get": "http-get",
+        "http-metadata-get": "http-get",
     }
 
     def execute_cli(self):