diff --git a/spec/support/shared/examples/msf/db_manager/event.rb b/spec/support/shared/examples/msf/db_manager/event.rb
index bf2fe942f4..4a99319520 100644
--- a/spec/support/shared/examples/msf/db_manager/event.rb
+++ b/spec/support/shared/examples/msf/db_manager/event.rb
@@ -1,9 +1,8 @@
 RSpec.shared_examples_for 'Msf::DBManager::Event' do
 
-  if ENV['REMOTE_DB']
-    before {skip("Awaiting event port")}
+  unless ENV['REMOTE_DB']
+    it { is_expected.to respond_to :events }
   end
 
-  it { is_expected.to respond_to :events }
   it { is_expected.to respond_to :report_event }
 end
\ No newline at end of file
diff --git a/spec/support/shared/examples/msf/db_manager/host_tag.rb b/spec/support/shared/examples/msf/db_manager/host_tag.rb
index 341cdc89dd..b5b5cc1aa6 100644
--- a/spec/support/shared/examples/msf/db_manager/host_tag.rb
+++ b/spec/support/shared/examples/msf/db_manager/host_tag.rb
@@ -1,7 +1,7 @@
 RSpec.shared_examples_for 'Msf::DBManager::HostTag' do
 
   if ENV['REMOTE_DB']
-    before {skip("")}
+    before {skip("Awaiting host tag port")}
   end
 
   it { is_expected.to respond_to :report_host_tag }