diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0427809..df03aaf1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ----------------------
 ### Added
 - **New icons:** CpcdosC+ (`.cpc`), Dafny (`.dfy`, `.dafny`), Homebrew (`Brewfile`), Kaitai (`.ksy`), Macaulay2 (`.m2`), Mermaid (`.mmd`, `.mermaid`), NEON (`.neon`), Tilt (`Tiltfile`)
-- **Support:** Archive (`.hqx`), C (`share/misc/getopt{,s}{0..9}`), Config (`shells`), Database (`birthtoken`, `flowers`), FontForge (`.ff`), Inno Setup (`.isl`), OpenBSD package data (`+CONTENTS`, `+DESC`, `+DISPLAY`), Roff (`{man,mdoc}.template`), Sieve (`.sieve`), Starlark (`.star`), TeX (`.texinfo`, `.txi`), Text (`share/misc/{operator,mail.{help,tildehelp}}`), Unit databases (`.units`, `units.lib`, `.units_history`), Unreal (`.uasset`)
+- **Support:** Archive (`.hqx`), C (`share/misc/getopt{,s}{0..9}`), Config (`shells`), Database (`birthtoken`, `flowers`), FontForge (`.ff`), Inno Setup (`.isl`), OpenBSD package data (`+CONTENTS`, `+DESC`, `+DISPLAY`), Roff (`{man,mdoc}.template`), Sieve (`.sieve`), Starlark (`.star`), Test, Shell (`-{spec,test}{,s}.sh`), TeX (`.texinfo`, `.txi`), Text (`share/misc/{operator,mail.{help,tildehelp}}`), Unit databases (`.units`, `units.lib`, `.units_history`), Unreal (`.uasset`)
 
 ### Changed
 - Changed `brew-icon` to use Homebrew logo
diff --git a/config.cson b/config.cson
index dc930ba0..7598c460 100644
--- a/config.cson
+++ b/config.cson
@@ -5954,7 +5954,7 @@ fileIcons:
 	"Test, Generic":
 		icon: "test-generic"
 		match: [
-			[/([\\/])t\1t?\d+(?:(?!\1).)+\.sh$/i, "medium-green", matchPath: true, priority: 1.5]
+			[/([\\/])t\1t?\d+(?:(?!\1).)+\.sh$|[._-](spec|test)s?\.sh$/i, "medium-green", matchPath: true, priority: 1.5]
 			[".test", "medium-green", priority: 0.25]
 			[".xspec", "dark-green"]
 		]
diff --git a/lib/icons/.icondb.js b/lib/icons/.icondb.js
index 2f72090b..20d27e4d 100644
--- a/lib/icons/.icondb.js
+++ b/lib/icons/.icondb.js
@@ -375,7 +375,7 @@ module.exports = [
 ["moho-icon",["medium-orange","medium-orange"],/\.mohoproj$/i,1.5],
 ["pros-icon",["medium-orange","medium-orange"],/^project\.pros$/i,1.5],
 ["test-coffee-icon",["medium-maroon","dark-maroon"],/[._-](?:spec|test)s?\.(?:(?:lit)?coffee|iced|cjsx)$/i,1.5],
-["test-generic-icon",["medium-green","medium-green"],/([\\\/])t\1t?\d+(?:(?!\1).)+\.sh$/i,1.5,true],
+["test-generic-icon",["medium-green","medium-green"],/([\\\/])t\1t?\d+(?:(?!\1).)+\.sh$|[._-](spec|test)s?\.sh$/i,1.5,true],
 ["test-go-icon",["medium-cyan","dark-cyan"],/[._-](?:spec|test)s?\.go$/i,1.5],
 ["test-hs-icon",["medium-purple","dark-purple"],/[._-](?:spec|test)s?\.(?:hsc?|c2hs|lhs)$/i,1.5],
 ["test-js-icon",["medium-yellow","dark-yellow"],/[._-](?:spec|test)s?\.(?:[_s]?js|js[bms]|es\d*)$/i,1.5],