diff --git a/README.md b/README.md
index 32d77a87..e3b05cc0 100644
--- a/README.md
+++ b/README.md
@@ -324,6 +324,10 @@ The following tests are not yet implemented and therefore missing:
 - Mandatory Test 6.1.57
 - Mandatory Test 6.1.58
 - Mandatory Test 6.1.59
+- Mandatory Test 6.1.60.1
+- Mandatory Test 6.1.60.2
+- Mandatory Test 6.1.60.3
+- Mandatory Test 6.1.61
 
 **Recommended Tests**
 
@@ -340,7 +344,10 @@ The following tests are not yet implemented and therefore missing:
 - Recommended Test 6.2.36
 - Recommended Test 6.2.37
 - Recommended Test 6.2.38
-- Recommended Test 6.2.39
+- Recommended Test 6.2.39.1
+- Recommended Test 6.2.39.3
+- Recommended Test 6.2.39.4
+- Recommended Test 6.2.39.5
 - Recommended Test 6.2.42
 - Recommended Test 6.2.44
 - Recommended Test 6.2.45
@@ -352,6 +359,10 @@ The following tests are not yet implemented and therefore missing:
 - Recommended Test 6.2.51
 - Recommended Test 6.2.52
 - Recommended Test 6.2.53
+- Recommended Test 6.2.54.1
+- Recommended Test 6.2.54.2
+- Recommended Test 6.2.54.3
+- Recommended Test 6.2.54.4
 
 **Informative Tests**
 
@@ -366,6 +377,16 @@ The following tests are not yet implemented and therefore missing:
 - Informative Test 6.2.19.4
 - Informative Test 6.2.19.5
 - Informative Test 6.2.20
+- Informative Test 6.2.21.1
+- Informative Test 6.2.21.2
+- Informative Test 6.2.21.3
+- Informative Test 6.2.21.4
+- Informative Test 6.2.21.5
+- Informative Test 6.2.21.6
+- Informative Test 6.2.21.7
+- Informative Test 6.2.21.8
+- Informative Test 6.2.21.9
+- Informative Test 6.2.22
 
 #### Module `csaf_2_1/schemaTests.js`
 
diff --git a/tests/csaf_2_1/oasis.js b/tests/csaf_2_1/oasis.js
index 8f223924..69ed16f3 100644
--- a/tests/csaf_2_1/oasis.js
+++ b/tests/csaf_2_1/oasis.js
@@ -5,9 +5,9 @@ import * as informative from '../../csaf_2_1/informativeTests.js'
 import * as recommended from '../../csaf_2_1/recommendedTests.js'
 import * as mandatory from '../../csaf_2_1/mandatoryTests.js'
 
-/*
-  This is a list that includes all test numbers that are not yet implemented.
-  Once all tests are implemented for CSAF 2.1 this should be deleted.
+/**
+ * This is a list that includes all test numbers that are not yet implemented.
+ * Once all tests are implemented for CSAF 2.1 this should be deleted.
  */
 const excluded = [
   '6.1.8',
@@ -31,6 +31,10 @@ const excluded = [
   '6.1.57',
   '6.1.58',
   '6.1.59',
+  '6.1.60.1',
+  '6.1.60.2',
+  '6.1.60.3',
+  '6.1.61',
   '6.2.11',
   '6.2.19',
   '6.2.20',
@@ -46,6 +50,7 @@ const excluded = [
   '6.2.39.1',
   '6.2.39.3',
   '6.2.39.4',
+  '6.2.39.5',
   '6.2.42',
   '6.2.44',
   '6.2.45',
@@ -58,6 +63,10 @@ const excluded = [
   '6.2.51',
   '6.2.52',
   '6.2.53',
+  '6.2.54.1',
+  '6.2.54.2',
+  '6.2.54.3',
+  '6.2.54.4',
   '6.3.12',
   '6.3.13',
   '6.3.14',
@@ -70,8 +79,28 @@ const excluded = [
   '6.3.19.4',
   '6.3.19.5',
   '6.3.20',
+  '6.3.21.1',
+  '6.3.21.2',
+  '6.3.21.3',
+  '6.3.21.4',
+  '6.3.21.5',
+  '6.3.21.6',
+  '6.3.21.7',
+  '6.3.21.8',
+  '6.3.21.9',
+  '6.3.22',
 ]
 
+/**
+ * This is a list that includes all implemented tests that are currently skipped due to known issues.
+ * Once the issues are resolved, these should be removed from this list and the tests should be re-enabled.
+ */
+const skippedTests = new Set([
+  'mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-01-12.json',
+  'mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-03-01.json',
+  'mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-27-05-03.json',
+])
+
 /** @typedef {import('../../lib/shared/types.js').DocumentTest} DocumentTest */
 
 /** @typedef {Map<string, DocumentTest>} TestMap */
@@ -127,6 +156,7 @@ for (const [group, t] of testMap) {
         for (const [type, testSpecs] of u) {
           describe(type, function () {
             for (const testSpec of testSpecs) {
+              if (skippedTests.has(testSpec.name)) continue
               if (excluded.includes(testId)) continue
 
               it(testSpec.name, async () => {
diff --git a/tests/oasis.js b/tests/oasis.js
index 2ab87d5c..2fb049a2 100644
--- a/tests/oasis.js
+++ b/tests/oasis.js
@@ -58,12 +58,6 @@ describe('oasis', function () {
           for (const [type, testSpecs] of u) {
             describe(type, function () {
               for (const testSpec of testSpecs) {
-                if (
-                  'mandatory/oasis_csaf_tc-csaf_2_0-2021-6-1-26-04.json' ===
-                  testSpec.name
-                ) {
-                  continue
-                }
                 it(testSpec.name, async function () {
                   const test = tests
                     .get(group)