diff --git a/tests/fixtures/shellcheck-tests/assignment-word3/source.sh b/tests/fixtures/shellcheck-tests/assignment-word3/source.sh
deleted file mode 100644
index 929b060..0000000
--- a/tests/fixtures/shellcheck-tests/assignment-word3/source.sh
+++ /dev/null
@@ -1 +0,0 @@
-$b = 13
\ No newline at end of file
diff --git a/tests/fixtures/shellcheck-tests/assignment-word4/source.sh b/tests/fixtures/shellcheck-tests/assignment-word4/source.sh
deleted file mode 100644
index feeb899..0000000
--- a/tests/fixtures/shellcheck-tests/assignment-word4/source.sh
+++ /dev/null
@@ -1 +0,0 @@
-b = $(lol)
\ No newline at end of file
diff --git a/tests/fixtures/shellcheck-tests/assignment-word6/source.sh b/tests/fixtures/shellcheck-tests/assignment-word6/source.sh
deleted file mode 100644
index c8f49f2..0000000
--- a/tests/fixtures/shellcheck-tests/assignment-word6/source.sh
+++ /dev/null
@@ -1 +0,0 @@
-b += (1 2 3)
\ No newline at end of file
diff --git a/tests/fixtures/shellcheck-tests/back-ticked3/source.sh b/tests/fixtures/shellcheck-tests/back-ticked3/source.sh
deleted file mode 100644
index ab0de6a..0000000
--- a/tests/fixtures/shellcheck-tests/back-ticked3/source.sh
+++ /dev/null
@@ -1 +0,0 @@
-´grep "\""´
\ No newline at end of file
diff --git a/tests/fixtures/shellcheck-tests/brace-group2/source.sh b/tests/fixtures/shellcheck-tests/brace-group2/source.sh
deleted file mode 100644
index 7108b1c..0000000
--- a/tests/fixtures/shellcheck-tests/brace-group2/source.sh
+++ /dev/null
@@ -1 +0,0 @@
-{foo;}
\ No newline at end of file
diff --git a/tests/fixtures/shellcheck-tests/condition12/source.sh b/tests/fixtures/shellcheck-tests/condition12/source.sh
index ca42a03..b361a4c 100644
--- a/tests/fixtures/shellcheck-tests/condition12/source.sh
+++ b/tests/fixtures/shellcheck-tests/condition12/source.sh
@@ -1,2 +1,2 @@
-[ a == b 
- -o c == d ]
\ No newline at end of file
+[ a == b \
+ -o c == d ]
diff --git a/tests/fixtures/shellcheck-tests/condition14/source.sh b/tests/fixtures/shellcheck-tests/condition14/source.sh
deleted file mode 100644
index b90b0e8..0000000
--- a/tests/fixtures/shellcheck-tests/condition14/source.sh
+++ /dev/null
@@ -1 +0,0 @@
-[ foo '>' bar ]
\ No newline at end of file
diff --git a/tests/fixtures/shellcheck-tests/condition15/source.sh b/tests/fixtures/shellcheck-tests/condition15/source.sh
deleted file mode 100644
index 592cf52..0000000
--- a/tests/fixtures/shellcheck-tests/condition15/source.sh
+++ /dev/null
@@ -1 +0,0 @@
-[ foo ">=" bar ]
\ No newline at end of file
diff --git a/tests/fixtures/shellcheck-tests/for-clause12/source.sh b/tests/fixtures/shellcheck-tests/for-clause12/source.sh
deleted file mode 100644
index 51f2a01..0000000
--- a/tests/fixtures/shellcheck-tests/for-clause12/source.sh
+++ /dev/null
@@ -1 +0,0 @@
-for $a in *; do echo "$a"; done
\ No newline at end of file
diff --git a/tests/fixtures/shellcheck-tests/function-definition11/error.json b/tests/fixtures/shellcheck-tests/function-definition11/error.json
new file mode 100644
index 0000000..0f9a1c9
--- /dev/null
+++ b/tests/fixtures/shellcheck-tests/function-definition11/error.json
@@ -0,0 +1,3 @@
+{
+  "shellcheck": "SC1095: You need a space or linefeed between the function name and body."
+}
diff --git a/tests/fixtures/shellcheck-tests/function-definition4/error.json b/tests/fixtures/shellcheck-tests/function-definition4/error.json
new file mode 100644
index 0000000..f81ae21
--- /dev/null
+++ b/tests/fixtures/shellcheck-tests/function-definition4/error.json
@@ -0,0 +1,3 @@
+{
+  "shellcheck": "SC1065: Trying to declare parameters? Don't. Use () and refer to params as $1, $2.."
+}
diff --git a/tests/fixtures/shellcheck-tests/here-doc2/error.json b/tests/fixtures/shellcheck-tests/here-doc2/error.json
new file mode 100644
index 0000000..81fb979
--- /dev/null
+++ b/tests/fixtures/shellcheck-tests/here-doc2/error.json
@@ -0,0 +1,3 @@
+{
+  "shellcheck": "SC1040: When using <<-, you can only indent with tabs."
+}
diff --git a/tests/fixtures/shellcheck-tests/if-clause2/error.json b/tests/fixtures/shellcheck-tests/if-clause2/error.json
new file mode 100644
index 0000000..f522b17
--- /dev/null
+++ b/tests/fixtures/shellcheck-tests/if-clause2/error.json
@@ -0,0 +1,3 @@
+{
+  "shellcheck": "SC1051: No semicolons directly after 'then'."
+}
diff --git a/tests/fixtures/shellcheck-tests/if-clause3/error.json b/tests/fixtures/shellcheck-tests/if-clause3/error.json
new file mode 100644
index 0000000..f12ce10
--- /dev/null
+++ b/tests/fixtures/shellcheck-tests/if-clause3/error.json
@@ -0,0 +1,3 @@
+{
+  "shellcheck": "SC1053: No semicolons directly after 'else'."
+}
diff --git a/tests/fixtures/shellcheck-tests/if-clause4/error.json b/tests/fixtures/shellcheck-tests/if-clause4/error.json
new file mode 100644
index 0000000..c3b0217
--- /dev/null
+++ b/tests/fixtures/shellcheck-tests/if-clause4/error.json
@@ -0,0 +1,3 @@
+{
+  "shellcheck": "SC1075: Use 'elif' instead of 'else if'"
+}
diff --git a/tests/fixtures/shellcheck-tests/io-number-redirect5/error.json b/tests/fixtures/shellcheck-tests/io-number-redirect5/error.json
new file mode 100644
index 0000000..9fa405e
--- /dev/null
+++ b/tests/fixtures/shellcheck-tests/io-number-redirect5/error.json
@@ -0,0 +1,3 @@
+{
+  "shellcheck": "SC1054: You need a space after the '{'"
+}
diff --git a/tests/fixtures/shellcheck-tests/io-number-redirect6/error.json b/tests/fixtures/shellcheck-tests/io-number-redirect6/error.json
new file mode 100644
index 0000000..9fa405e
--- /dev/null
+++ b/tests/fixtures/shellcheck-tests/io-number-redirect6/error.json
@@ -0,0 +1,3 @@
+{
+  "shellcheck": "SC1054: You need a space after the '{'"
+}
diff --git a/tests/fixtures/shellcheck-tests/dollar-brace-command-expansion1/source.sh b/tests/fixtures/shellcheck-tests/ksh-dollar-brace-command-expansion1/source.sh
similarity index 100%
rename from tests/fixtures/shellcheck-tests/dollar-brace-command-expansion1/source.sh
rename to tests/fixtures/shellcheck-tests/ksh-dollar-brace-command-expansion1/source.sh
diff --git a/tests/fixtures/shellcheck-tests/dollar-brace-command-expansion2/source.sh b/tests/fixtures/shellcheck-tests/ksh-dollar-brace-command-expansion2/source.sh
similarity index 100%
rename from tests/fixtures/shellcheck-tests/dollar-brace-command-expansion2/source.sh
rename to tests/fixtures/shellcheck-tests/ksh-dollar-brace-command-expansion2/source.sh
diff --git a/tests/fixtures/shellcheck-tests/double-quoted6/source.sh b/tests/fixtures/shellcheck-tests/ksh-double-quoted6/source.sh
similarity index 100%
rename from tests/fixtures/shellcheck-tests/double-quoted6/source.sh
rename to tests/fixtures/shellcheck-tests/ksh-double-quoted6/source.sh
diff --git a/tests/fixtures/shellcheck-tests/double-quoted7/source.sh b/tests/fixtures/shellcheck-tests/ksh-double-quoted7/source.sh
similarity index 100%
rename from tests/fixtures/shellcheck-tests/double-quoted7/source.sh
rename to tests/fixtures/shellcheck-tests/ksh-double-quoted7/source.sh
diff --git a/tests/fixtures/shellcheck-tests/pipeline2/error.json b/tests/fixtures/shellcheck-tests/pipeline2/error.json
new file mode 100644
index 0000000..0c24767
--- /dev/null
+++ b/tests/fixtures/shellcheck-tests/pipeline2/error.json
@@ -0,0 +1,3 @@
+{
+  "shellcheck": "SC1035: You are missing a required space after the !."
+}
diff --git a/tests/fixtures/shellcheck-tests/script2/error.json b/tests/fixtures/shellcheck-tests/script2/error.json
new file mode 100644
index 0000000..fcccd7d
--- /dev/null
+++ b/tests/fixtures/shellcheck-tests/script2/error.json
@@ -0,0 +1,3 @@
+{
+  "shellcheck": "SC1017: Literal carriage return. Run script through tr -d '\r'"
+}
diff --git a/tests/fixtures/shellcheck-tests/script3/error.json b/tests/fixtures/shellcheck-tests/script3/error.json
new file mode 100644
index 0000000..b388430
--- /dev/null
+++ b/tests/fixtures/shellcheck-tests/script3/error.json
@@ -0,0 +1,3 @@
+{
+  "shellcheck": "SC1018: This is a unicode non-breaking space. Delete and retype it"
+}
diff --git a/tests/fixtures/shellcheck-tests/script4/source.sh b/tests/fixtures/shellcheck-tests/script4/source.sh
deleted file mode 100644
index 899fa69..0000000
--- a/tests/fixtures/shellcheck-tests/script4/source.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/perl
-foo=(
\ No newline at end of file
diff --git a/tests/fixtures/shellcheck-tests/separator1/error.json b/tests/fixtures/shellcheck-tests/separator1/error.json
new file mode 100644
index 0000000..cf45a8a
--- /dev/null
+++ b/tests/fixtures/shellcheck-tests/separator1/error.json
@@ -0,0 +1,3 @@
+{
+  "shellcheck": "SC1045: It's not 'foo &; bar', just 'foo & bar'."
+}
diff --git a/tests/fixtures/shellcheck-tests/shebang2/error.json b/tests/fixtures/shellcheck-tests/shebang2/error.json
new file mode 100644
index 0000000..8db44d7
--- /dev/null
+++ b/tests/fixtures/shellcheck-tests/shebang2/error.json
@@ -0,0 +1,3 @@
+{
+  "shellcheck": "SC1084: Use #!, not !#, for the shebang."
+}