diff --git a/tests/conditionals/cond-wf-002.cwl b/tests/conditionals/cond-wf-002.cwl
index 7549a5fb..de1e9793 100644
--- a/tests/conditionals/cond-wf-002.cwl
+++ b/tests/conditionals/cond-wf-002.cwl
@@ -15,7 +15,7 @@ steps:
 
 outputs:
   out1: 
-    type: string
+    type: string?
     outputSource: step1/out1
 
 requirements: 
diff --git a/tests/conditionals/cond-wf-002_nojs.cwl b/tests/conditionals/cond-wf-002_nojs.cwl
index e5ee4b5e..4f3d7da6 100644
--- a/tests/conditionals/cond-wf-002_nojs.cwl
+++ b/tests/conditionals/cond-wf-002_nojs.cwl
@@ -18,5 +18,5 @@ steps:
 
 outputs:
   out1: 
-    type: string
+    type: string?
     outputSource: step1/out1
diff --git a/tests/conditionals/cond-wf-011.cwl b/tests/conditionals/cond-wf-011.cwl
index cf99cc85..d05554d4 100644
--- a/tests/conditionals/cond-wf-011.cwl
+++ b/tests/conditionals/cond-wf-011.cwl
@@ -26,7 +26,7 @@ outputs:
         type: array
         items:
           type: array
-          items: string
+          items: [string, 'null']
     outputSource: step1/out1
     pickValue: all_non_null
 
diff --git a/tests/conditionals/cond-wf-011_nojs.cwl b/tests/conditionals/cond-wf-011_nojs.cwl
index 21c3e0e7..deca8cc2 100644
--- a/tests/conditionals/cond-wf-011_nojs.cwl
+++ b/tests/conditionals/cond-wf-011_nojs.cwl
@@ -36,7 +36,7 @@ outputs:
         type: array
         items:
           type: array
-          items: string
+          items: [string, 'null']
     outputSource: step1/out1
     pickValue: all_non_null
 
diff --git a/tests/conditionals/test-index.yaml b/tests/conditionals/test-index.yaml
index 6b7d8c48..d6dfa65e 100644
--- a/tests/conditionals/test-index.yaml
+++ b/tests/conditionals/test-index.yaml
@@ -23,7 +23,6 @@
 
 - id: cond-3
   label: direct_required
-  doc: Should give validation warning because of required sink
   tool: cond-wf-002.cwl
   job: val.1.job.yaml
   output:
@@ -230,7 +229,6 @@
 
 - id: cond-3_nojs
   label: direct_required_nojs
-  doc: Should give validation warning because of required sink, no javascript
   tool: cond-wf-002_nojs.cwl
   job: val.1.job.yaml
   output: