diff --git a/t/00_local_spelling.t b/t/00_local_spelling.t
index 62055182..dd10ce2b 100644
--- a/t/00_local_spelling.t
+++ b/t/00_local_spelling.t
@@ -5,7 +5,10 @@
 use warnings;
 use strict;
 use Test::More;
-use Test::Spelling;
+
+eval "use Test::Spelling";
+plan skip_all => "Test::Spelling required for checking spelling"
+    if $@;
 
 set_spell_cmd('aspell list');
 add_stopwords(<DATA>);
@@ -22,7 +25,9 @@ alteon
 airespace
 aironet
 airos
+Alcatel
 alcatel
+AOS
 ap
 APs
 arn
@@ -49,6 +54,7 @@ bitmask
 bladecenter
 bln
 bpdus
+BSSID
 bulkrepeaters
 bulkwalk
 cabletron
@@ -84,6 +90,7 @@ eigrp
 erszenyi
 ess
 etherlike
+ethernet
 enterasys
 extranet
 fastiron
@@ -122,6 +129,7 @@ loopback
 loopdetect
 lorensen
 lsb
+Lucent
 lucent
 luiggi
 lwapp
@@ -155,6 +163,7 @@ oem
 ofdm
 oid
 oids
+OmniSwitch
 os
 osi
 ospf
@@ -210,6 +219,8 @@ telesys
 tftp
 tftpfilename
 tftpserver
+TiMOS
+tmnxModel
 tuttle
 ucsc
 uninstall
@@ -223,4 +234,4 @@ wlan
 wlans
 WS
 zoltan
-zyxel
\ No newline at end of file
+zyxel
diff --git a/t/00_local_versionsync.t b/t/00_local_versionsync.t
index b6a9a43c..95b04d2c 100644
--- a/t/00_local_versionsync.t
+++ b/t/00_local_versionsync.t
@@ -5,12 +5,14 @@
 use warnings;
 use strict;
 use File::Find;
-use Test::More qw(no_plan);
+use Test::More;
 
 eval "use File::Slurp";
 plan skip_all => "File::Slurp required for testing version sync"
     if $@;
 
+plan qw(no_plan);
+
 my $last_version = undef;
 find({wanted => \&check_version, no_chdir => 1}, 'blib');
 if (! defined $last_version) {