3 files changed, 7 insertions, 7 deletions
diff --git a/test/wsdl/document/echo.rb b/test/wsdl/document/echo.rb
index 05f00412f4..c6df75aca0 100644
--- a/test/wsdl/document/echo.rb
+++ b/test/wsdl/document/echo.rb
@@ -5,7 +5,7 @@ class Echoele
   @@schema_type = "echoele"
   @@schema_ns = "urn:docrpc"
   @@schema_attribute = {XSD::QName.new(nil, "attr_string") => "SOAP::SOAPString", XSD::QName.new(nil, "attr-int") => "SOAP::SOAPInt"}
-  @@schema_element = [["struct1", "Echo_struct"], ["struct_2", ["Echo_struct", XSD::QName.new(nil, "struct-2")]]]
+  @@schema_element = [["struct1", ["Echo_struct", XSD::QName.new(nil, "struct1")]], ["struct_2", ["Echo_struct", XSD::QName.new(nil, "struct-2")]]]
 
   attr_accessor :struct1
   attr_accessor :struct_2
@@ -38,7 +38,7 @@ class Echo_response
   @@schema_type = "echo_response"
   @@schema_ns = "urn:docrpc"
   @@schema_attribute = {XSD::QName.new(nil, "attr_string") => "SOAP::SOAPString", XSD::QName.new(nil, "attr-int") => "SOAP::SOAPInt"}
-  @@schema_element = [["struct1", "Echo_struct"], ["struct_2", ["Echo_struct", XSD::QName.new(nil, "struct-2")]]]
+  @@schema_element = [["struct1", ["Echo_struct", XSD::QName.new(nil, "struct1")]], ["struct_2", ["Echo_struct", XSD::QName.new(nil, "struct-2")]]]
 
   attr_accessor :struct1
   attr_accessor :struct_2
@@ -70,18 +70,18 @@ end
 class Echo_struct
   @@schema_type = "echo_struct"
   @@schema_ns = "urn:docrpc"
-  @@schema_attribute = {XSD::QName.new("urn:docrpc", "m_attr") => "SOAP::SOAPString"}
-  @@schema_element = [["m_string", "SOAP::SOAPString"], ["m_datetime", "SOAP::SOAPDateTime"]]
+  @@schema_attribute = {XSD::QName.new(nil, "m_attr") => "SOAP::SOAPString"}
+  @@schema_element = [["m_string", ["SOAP::SOAPString", XSD::QName.new(nil, "m_string")]], ["m_datetime", ["SOAP::SOAPDateTime", XSD::QName.new(nil, "m_datetime")]]]
 
   attr_accessor :m_string
   attr_accessor :m_datetime
 
   def xmlattr_m_attr
-    (@__xmlattr ||= {})[XSD::QName.new("urn:docrpc", "m_attr")]
+    (@__xmlattr ||= {})[XSD::QName.new(nil, "m_attr")]
   end
 
   def xmlattr_m_attr=(value)
-    (@__xmlattr ||= {})[XSD::QName.new("urn:docrpc", "m_attr")] = value
+    (@__xmlattr ||= {})[XSD::QName.new(nil, "m_attr")] = value
   end
 
   def initialize(m_string = nil, m_datetime = nil)
diff --git a/test/wsdl/marshal/person_org.rb b/test/wsdl/marshal/person_org.rb
index 55405b658d..f8c0e0db76 100644
--- a/test/wsdl/marshal/person_org.rb
+++ b/test/wsdl/marshal/person_org.rb
@@ -4,7 +4,7 @@ require 'xsd/qname'
 class Person
   @@schema_type = "Person"
   @@schema_ns = "http://www.jin.gr.jp/~nahi/xmlns/sample/Person"
-  @@schema_element = [["familyname", "SOAP::SOAPString"], ["givenname", "SOAP::SOAPString"], ["var1", "SOAP::SOAPInt"], ["var2", "SOAP::SOAPDouble"], ["var3", "SOAP::SOAPString"]]
+  @@schema_element = [["familyname", ["SOAP::SOAPString", XSD::QName.new(nil, "familyname")]], ["givenname", ["SOAP::SOAPString", XSD::QName.new(nil, "givenname")]], ["var1", ["SOAP::SOAPInt", XSD::QName.new(nil, "var1")]], ["var2", ["SOAP::SOAPDouble", XSD::QName.new(nil, "var2")]], ["var3", ["SOAP::SOAPString", XSD::QName.new(nil, "var3")]]]
 
   attr_accessor :familyname
   attr_accessor :givenname
diff --git a/test/wsdl/qualified/lp.rb b/test/wsdl/qualified/lp.rb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/wsdl/qualified/lp.rb