diff --git a/tests/bufr_ls.sh b/tests/bufr_ls.sh
index 2879ed36f..0aed3128e 100755
--- a/tests/bufr_ls.sh
+++ b/tests/bufr_ls.sh
@@ -64,6 +64,11 @@ ${tools_dir}/bufr_ls -s satelliteID=313 -p satelliteID aaen_55.bufr > $fTmp
 grep -q "313" $fTmp
 
 
+# ------------------------
+# Test -w
+# ------------------------
+${tools_dir}/bufr_ls -w count=2 syno_multi.bufr
+
 # ------------------------
 # Test corner cases
 # ------------------------
diff --git a/tests/gts_ls.sh b/tests/gts_ls.sh
index ce6683ea1..1cd4cc9fb 100755
--- a/tests/gts_ls.sh
+++ b/tests/gts_ls.sh
@@ -25,15 +25,25 @@ touch $fLog
 fTmp=${label}".tmp.txt"
 rm -f $fTmp
 
-#----------------------------------------------
-# Test default "ls" on all the gts data files
-#----------------------------------------------
+#-------------------------------------------
+# Test default "ls" on the gts data file
+#-------------------------------------------
 gts_file=EGRR20150317121020_00493212.DAT
 f=$gts_file
 
 echo $f >> $fLog
 ${tools_dir}/gts_ls $f >> $fLog
 
+#-------------------------------------------
+# Test "-s" switch
+#-------------------------------------------
+${tools_dir}/gts_ls -s YY=abc $f >> $fLog
+
+#-------------------------------------------
+# Test "-w" switch
+#-------------------------------------------
+${tools_dir}/gts_ls -w AA=IY $f >> $fLog
+
 #-------------------------------------------
 # Test "-p" switch
 #-------------------------------------------
diff --git a/tests/metar_ls.sh b/tests/metar_ls.sh
index 8e2cfc14f..779619b8f 100755
--- a/tests/metar_ls.sh
+++ b/tests/metar_ls.sh
@@ -36,6 +36,12 @@ export METAR_MONTH=4
 echo $f >> $fLog
 ${tools_dir}/metar_ls $f >> $fLog
 
+#-------------------------------------------
+# Test "-w" switch
+#-------------------------------------------
+${tools_dir}/metar_ls -w CCCC=VILK $f >> $fLog
+
+
 #-------------------------------------------
 # Test "-p" switch
 #-------------------------------------------