diff --git a/tests/unittests/portadmin/napalm/juniper_poe_test.py b/tests/unittests/portadmin/napalm/juniper_poe_test.py
index f0ecf50d5c..5e3fc4df05 100644
--- a/tests/unittests/portadmin/napalm/juniper_poe_test.py
+++ b/tests/unittests/portadmin/napalm/juniper_poe_test.py
@@ -64,6 +64,21 @@ def test_returns_correct_states_if_input_has_multiple_interfaces(
         assert return_dict[interface1_mock.ifname] == Juniper.POE_ENABLED
         assert return_dict[interface2_mock.ifname] == Juniper.POE_DISABLED
 
+    def test_returns_none_for_single_interface_that_does_not_support_poe(
+        self, handler_mock, interface1_mock
+    ):
+        handler_mock._get_single_poe_state = Mock(side_effect=POENotSupportedError)
+        return_dict = handler_mock.get_poe_states([interface1_mock])
+        assert return_dict[interface1_mock.ifname] is None
+
+    def test_returns_none_for_multiple_interfaces_that_does_not_support_poe(
+        self, handler_mock, interface1_mock, interface2_mock, xml_empty
+    ):
+        handler_mock._get_all_poe_interface_information = Mock(return_value=xml_empty)
+        return_dict = handler_mock.get_poe_states([interface1_mock, interface2_mock])
+        assert return_dict[interface1_mock.ifname] is None
+        assert return_dict[interface2_mock.ifname] is None
+
 
 class TestGetSinglePoeState:
     def test_returns_correct_state_for_interface_that_exists_in_xml_response(