diff --git a/Packs/McAfee_ESM/.pack-ignore b/Packs/McAfee_ESM/.pack-ignore
index 422e65193ded..4160682d8ab8 100644
--- a/Packs/McAfee_ESM/.pack-ignore
+++ b/Packs/McAfee_ESM/.pack-ignore
@@ -1,2 +1,8 @@
 [file:McAfee_ESM_v2.yml]
 ignore=IN126
+
+[file:McAfee_ESM_v2_-_Test.yml]
+ignore=auto-test
+
+[file:playbook-McAfee_ESM_Watchlists_-_Test.yml]
+ignore=auto-test
diff --git a/Packs/McAfee_ESM/TestPlaybooks/McAfee_ESM_Watchlists_-_Test_v10.2.0.yml b/Packs/McAfee_ESM/TestPlaybooks/McAfee_ESM_Watchlists_-_Test_v10.2.0.yml
new file mode 100644
index 000000000000..d0a6d02c505c
--- /dev/null
+++ b/Packs/McAfee_ESM/TestPlaybooks/McAfee_ESM_Watchlists_-_Test_v10.2.0.yml
@@ -0,0 +1,79 @@
+id: McAfee ESM Watchlists - Test v10.2.0
+version: -1
+name: McAfee ESM Watchlists - Test v10.2.0
+starttaskid: "0"
+tasks:
+  "0":
+    id: "0"
+    taskid: 1e7cf6f9-14b4-45c7-b937-dc825fc72bd8
+    type: start
+    task:
+      id: 1e7cf6f9-14b4-45c7-b937-dc825fc72bd8
+      version: -1
+      name: ""
+      iscommand: false
+      brand: ""
+    nexttasks:
+      '#none#':
+      - "1"
+    separatecontext: false
+    view: |-
+      {
+        "position": {
+          "x": 50,
+          "y": 50
+        }
+      }
+    note: false
+    timertriggers: []
+    ignoreworker: false
+    skipunavailable: false
+    quietmode: 0
+    isoversize: false
+  "1":
+    id: "1"
+    taskid: 839e8fba-b6eb-4848-baf2-30142d8ba4fa
+    type: regular
+    task:
+      id: 839e8fba-b6eb-4848-baf2-30142d8ba4fa
+      version: -1
+      name: set playbook to McAfee ESM Watchlists - Test
+      description: set playbook for current incident to McAfee ESM Watchlists - Test
+      script: Builtin|||setPlaybook
+      type: regular
+      iscommand: true
+      brand: Builtin
+    scriptarguments:
+      incidentId:
+        simple: ${incident.id}
+      name:
+        simple: McAfee ESM Watchlists - Test
+    separatecontext: false
+    view: |-
+      {
+        "position": {
+          "x": 50,
+          "y": 230
+        }
+      }
+    note: false
+    timertriggers: []
+    ignoreworker: false
+    skipunavailable: false
+    quietmode: 0
+    isoversize: false
+view: |-
+  {
+    "linkLabelsPosition": {},
+    "paper": {
+      "dimensions": {
+        "height": 275,
+        "width": 380,
+        "x": 50,
+        "y": 50
+      }
+    }
+  }
+inputs: []
+outputs: []
+fromversion: 5.0.0
diff --git a/Packs/McAfee_ESM/TestPlaybooks/McAfee_ESM_Watchlists_-_Test_v10.3.0.yml b/Packs/McAfee_ESM/TestPlaybooks/McAfee_ESM_Watchlists_-_Test_v10.3.0.yml
new file mode 100644
index 000000000000..b1b057cc1208
--- /dev/null
+++ b/Packs/McAfee_ESM/TestPlaybooks/McAfee_ESM_Watchlists_-_Test_v10.3.0.yml
@@ -0,0 +1,79 @@
+id: McAfee ESM Watchlists - Test v10.3.0
+version: -1
+name: McAfee ESM Watchlists - Test v10.3.0
+starttaskid: "0"
+tasks:
+  "0":
+    id: "0"
+    taskid: 16a33cfe-c4e3-4f45-b26b-762e3dddb08f
+    type: start
+    task:
+      id: 16a33cfe-c4e3-4f45-b26b-762e3dddb08f
+      version: -1
+      name: ""
+      iscommand: false
+      brand: ""
+    nexttasks:
+      '#none#':
+      - "1"
+    separatecontext: false
+    view: |-
+      {
+        "position": {
+          "x": 50,
+          "y": 50
+        }
+      }
+    note: false
+    timertriggers: []
+    ignoreworker: false
+    skipunavailable: false
+    quietmode: 0
+    isoversize: false
+  "1":
+    id: "1"
+    taskid: 16c4a958-4f2b-42b5-957e-65370906c88d
+    type: regular
+    task:
+      id: 16c4a958-4f2b-42b5-957e-65370906c88d
+      version: -1
+      name: set playbook to McAfee ESM Watchlists - Test
+      description: set playbook for current incident to McAfee ESM Watchlists - Test
+      script: Builtin|||setPlaybook
+      type: regular
+      iscommand: true
+      brand: Builtin
+    scriptarguments:
+      incidentId:
+        simple: ${incident.id}
+      name:
+        simple: McAfee ESM Watchlists - Test
+    separatecontext: false
+    view: |-
+      {
+        "position": {
+          "x": 50,
+          "y": 230
+        }
+      }
+    note: false
+    timertriggers: []
+    ignoreworker: false
+    skipunavailable: false
+    quietmode: 0
+    isoversize: false
+view: |-
+  {
+    "linkLabelsPosition": {},
+    "paper": {
+      "dimensions": {
+        "height": 275,
+        "width": 380,
+        "x": 50,
+        "y": 50
+      }
+    }
+  }
+inputs: []
+outputs: []
+fromversion: 5.0.0
diff --git a/Packs/McAfee_ESM/TestPlaybooks/McAfee_ESM_Watchlists_-_Test_v11.3.yml b/Packs/McAfee_ESM/TestPlaybooks/McAfee_ESM_Watchlists_-_Test_v11.3.yml
new file mode 100644
index 000000000000..0cad2e82c11b
--- /dev/null
+++ b/Packs/McAfee_ESM/TestPlaybooks/McAfee_ESM_Watchlists_-_Test_v11.3.yml
@@ -0,0 +1,79 @@
+id: McAfee ESM Watchlists - Test v11.3
+version: -1
+name: McAfee ESM Watchlists - Test v11.3
+starttaskid: "0"
+tasks:
+  "0":
+    id: "0"
+    taskid: 0eb7b2f9-b429-4e5e-84e5-6c82553f84ca
+    type: start
+    task:
+      id: 0eb7b2f9-b429-4e5e-84e5-6c82553f84ca
+      version: -1
+      name: ""
+      iscommand: false
+      brand: ""
+    nexttasks:
+      '#none#':
+      - "1"
+    separatecontext: false
+    view: |-
+      {
+        "position": {
+          "x": 50,
+          "y": 50
+        }
+      }
+    note: false
+    timertriggers: []
+    ignoreworker: false
+    skipunavailable: false
+    quietmode: 0
+    isoversize: false
+  "1":
+    id: "1"
+    taskid: 365253e3-d529-425c-850d-08f577cb41f3
+    type: regular
+    task:
+      id: 365253e3-d529-425c-850d-08f577cb41f3
+      version: -1
+      name: set playbook to McAfee ESM Watchlists - Test
+      description: set playbook for current incident to McAfee ESM Watchlists - Test
+      script: Builtin|||setPlaybook
+      type: regular
+      iscommand: true
+      brand: Builtin
+    scriptarguments:
+      incidentId:
+        simple: ${incident.id}
+      name:
+        simple: McAfee ESM Watchlists - Test
+    separatecontext: false
+    view: |-
+      {
+        "position": {
+          "x": 50,
+          "y": 230
+        }
+      }
+    note: false
+    timertriggers: []
+    ignoreworker: false
+    skipunavailable: false
+    quietmode: 0
+    isoversize: false
+view: |-
+  {
+    "linkLabelsPosition": {},
+    "paper": {
+      "dimensions": {
+        "height": 275,
+        "width": 380,
+        "x": 50,
+        "y": 50
+      }
+    }
+  }
+inputs: []
+outputs: []
+fromversion: 5.0.0
diff --git a/Packs/McAfee_ESM/TestPlaybooks/McAfee_ESM_v2_-_Test_v10.2.0.yml b/Packs/McAfee_ESM/TestPlaybooks/McAfee_ESM_v2_-_Test_v10.2.0.yml
new file mode 100644
index 000000000000..87cc52faf909
--- /dev/null
+++ b/Packs/McAfee_ESM/TestPlaybooks/McAfee_ESM_v2_-_Test_v10.2.0.yml
@@ -0,0 +1,79 @@
+id: McAfee ESM v2 - Test v10.2.0
+version: -1
+name: McAfee ESM v2 - Test v10.2.0
+starttaskid: "0"
+tasks:
+  "0":
+    id: "0"
+    taskid: 736fa03c-6b54-4219-a649-639f9c28d3d0
+    type: start
+    task:
+      id: 736fa03c-6b54-4219-a649-639f9c28d3d0
+      version: -1
+      name: ""
+      iscommand: false
+      brand: ""
+    nexttasks:
+      '#none#':
+      - "1"
+    separatecontext: false
+    view: |-
+      {
+        "position": {
+          "x": 50,
+          "y": 50
+        }
+      }
+    note: false
+    timertriggers: []
+    ignoreworker: false
+    skipunavailable: false
+    quietmode: 0
+    isoversize: false
+  "1":
+    id: "1"
+    taskid: 489f7197-11f3-4b80-897d-3015cf7a6b9b
+    type: regular
+    task:
+      id: 489f7197-11f3-4b80-897d-3015cf7a6b9b
+      version: -1
+      name: set playbook to McAfee ESM v2 - Test
+      description: set playbook for current incident to McAfee ESM v2 - Test
+      script: Builtin|||setPlaybook
+      type: regular
+      iscommand: true
+      brand: Builtin
+    scriptarguments:
+      incidentId:
+        simple: ${incident.id}
+      name:
+        simple: McAfee ESM v2 - Test
+    separatecontext: false
+    view: |-
+      {
+        "position": {
+          "x": 50,
+          "y": 230
+        }
+      }
+    note: false
+    timertriggers: []
+    ignoreworker: false
+    skipunavailable: false
+    quietmode: 0
+    isoversize: false
+view: |-
+  {
+    "linkLabelsPosition": {},
+    "paper": {
+      "dimensions": {
+        "height": 275,
+        "width": 380,
+        "x": 50,
+        "y": 50
+      }
+    }
+  }
+inputs: []
+outputs: []
+fromversion: 5.0.0
diff --git a/Packs/McAfee_ESM/TestPlaybooks/McAfee_ESM_v2_-_Test_v10.3.0.yml b/Packs/McAfee_ESM/TestPlaybooks/McAfee_ESM_v2_-_Test_v10.3.0.yml
new file mode 100644
index 000000000000..877520aa54d2
--- /dev/null
+++ b/Packs/McAfee_ESM/TestPlaybooks/McAfee_ESM_v2_-_Test_v10.3.0.yml
@@ -0,0 +1,79 @@
+id: McAfee ESM v2 - Test v10.3.0
+version: -1
+name: McAfee ESM v2 - Test v10.3.0
+starttaskid: "0"
+tasks:
+  "0":
+    id: "0"
+    taskid: 33c9a3d8-1cbd-45f1-9a86-a97791b25754
+    type: start
+    task:
+      id: 33c9a3d8-1cbd-45f1-9a86-a97791b25754
+      version: -1
+      name: ""
+      iscommand: false
+      brand: ""
+    nexttasks:
+      '#none#':
+      - "1"
+    separatecontext: false
+    view: |-
+      {
+        "position": {
+          "x": 50,
+          "y": 50
+        }
+      }
+    note: false
+    timertriggers: []
+    ignoreworker: false
+    skipunavailable: false
+    quietmode: 0
+    isoversize: false
+  "1":
+    id: "1"
+    taskid: ca5a966a-6c41-492c-8fd6-5c9561f09a51
+    type: regular
+    task:
+      id: ca5a966a-6c41-492c-8fd6-5c9561f09a51
+      version: -1
+      name: set playbook to McAfee ESM v2 - Test
+      description: set playbook for current incident to McAfee ESM v2 - Test
+      script: Builtin|||setPlaybook
+      type: regular
+      iscommand: true
+      brand: Builtin
+    scriptarguments:
+      incidentId:
+        simple: ${incident.id}
+      name:
+        simple: McAfee ESM v2 - Test
+    separatecontext: false
+    view: |-
+      {
+        "position": {
+          "x": 50,
+          "y": 230
+        }
+      }
+    note: false
+    timertriggers: []
+    ignoreworker: false
+    skipunavailable: false
+    quietmode: 0
+    isoversize: false
+view: |-
+  {
+    "linkLabelsPosition": {},
+    "paper": {
+      "dimensions": {
+        "height": 275,
+        "width": 380,
+        "x": 50,
+        "y": 50
+      }
+    }
+  }
+inputs: []
+outputs: []
+fromversion: 5.0.0
diff --git a/Tests/conf.json b/Tests/conf.json
index b0855b52efad..8eb2df355293 100644
--- a/Tests/conf.json
+++ b/Tests/conf.json
@@ -1369,13 +1369,13 @@
         {
             "integrations": "McAfee ESM v2",
             "instance_names": "v10.2.0",
-            "playbookID": "McAfee ESM v2 - Test",
+            "playbookID": "McAfee ESM v2 - Test v10.2.0",
             "fromversion": "5.0.0"
         },
         {
             "integrations": "McAfee ESM v2",
             "instance_names": "v10.3.0",
-            "playbookID": "McAfee ESM v2 - Test",
+            "playbookID": "McAfee ESM v2 - Test v10.3.0",
             "fromversion": "5.0.0"
         },
         {
@@ -1388,19 +1388,19 @@
         {
             "integrations": "McAfee ESM v2",
             "instance_names": "v10.2.0",
-            "playbookID": "McAfee ESM Watchlists - Test",
+            "playbookID": "McAfee ESM Watchlists - Test v10.2.0",
             "fromversion": "5.0.0"
         },
         {
             "integrations": "McAfee ESM v2",
             "instance_names": "v10.3.0",
-            "playbookID": "McAfee ESM Watchlists - Test",
+            "playbookID": "McAfee ESM Watchlists - Test v10.3.0",
             "fromversion": "5.0.0"
         },
         {
             "integrations": "McAfee ESM v2",
             "instance_names": "v11.3",
-            "playbookID": "McAfee ESM Watchlists - Test",
+            "playbookID": "McAfee ESM Watchlists - Test v11.3",
             "fromversion": "5.0.0"
         },
         {
@@ -3436,7 +3436,6 @@
         "Google Key Management Service": "The API requires an SSL secure connection to work.",
         "McAfee ESM-v10": "we have multiple instances with same test playbook, mock recording are per playbook so it keeps failing the playback step",
         "SplunkPy": "we have multiple instances with same test playbook, mock recording are per playbook so it keeps failing the playback step",
-        "McAfee ESM v2": "we have multiple instances with same test playbook, mock recording are per playbook so it keeps failing the playback step",
         "mysql": "Does not use http",
         "SlackV2": "Integration requires SSL",
         "Whois": "Mocks does not support sockets",