diff --git a/tests/DOM/conformance/level1/core/elementremoveattribute.hpp b/tests/DOM/conformance/level1/core/elementremoveattribute.hpp
index bb0bcd5f..2ddb7820 100644
--- a/tests/DOM/conformance/level1/core/elementremoveattribute.hpp
+++ b/tests/DOM/conformance/level1/core/elementremoveattribute.hpp
@@ -81,11 +81,14 @@ class elementremoveattribute : public DOMTestCase<string_type, string_adaptor>
       Document doc;
       NodeList elementList;
       Element testEmployee;
+      Node attrNode;
       String attrValue;
       doc = (Document) baseT::load("staff", true);
       elementList = doc.getElementsByTagName(SA::construct_from_utf8("address"));
       testEmployee = (Element) elementList.item(3);
       testEmployee.removeAttribute(SA::construct_from_utf8("street"));
+      attrNode = testEmployee.getAttributeNode(SA::construct_from_utf8("street"));
+      baseT::skipIfNull(attrNode);
       attrValue = testEmployee.getAttribute(SA::construct_from_utf8("street"));
       baseT::assertEquals("Yes", attrValue, __LINE__, __FILE__);
   
diff --git a/tests/DOM/conformance/level1/core/elementremoveattributerestoredefaultvalue.hpp b/tests/DOM/conformance/level1/core/elementremoveattributerestoredefaultvalue.hpp
index 31644fec..49ca92c2 100644
--- a/tests/DOM/conformance/level1/core/elementremoveattributerestoredefaultvalue.hpp
+++ b/tests/DOM/conformance/level1/core/elementremoveattributerestoredefaultvalue.hpp
@@ -86,6 +86,8 @@ class elementremoveattributerestoredefaultvalue : public DOMTestCase<string_type
       testEmployee = (Element) elementList.item(2);
       streetAttr = testEmployee.getAttributeNode(SA::construct_from_utf8("street"));
       removedAttr = testEmployee.removeAttributeNode(streetAttr);
+      streetAttr = testEmployee.getAttributeNode(SA::construct_from_utf8("street"));
+      baseT::skipIfNull(streetAttr);
       attribute = testEmployee.getAttribute(SA::construct_from_utf8("street"));
       baseT::assertEquals("Yes", attribute, __LINE__, __FILE__);