diff --git a/lib/OpenLayers/Format/WFST/v1_0_0.js b/lib/OpenLayers/Format/WFST/v1_0_0.js
index 75496de1fa..dfb40c3107 100644
--- a/lib/OpenLayers/Format/WFST/v1_0_0.js
+++ b/lib/OpenLayers/Format/WFST/v1_0_0.js
@@ -108,6 +108,15 @@ OpenLayers.Format.WFST.v1_0_0 = OpenLayers.Class(
                 if(options.featureNS) {
                     node.setAttribute("xmlns:" + options.featurePrefix, options.featureNS);
                 }
+                if(options.propertyNames) {
+                    for(var i=0,len = options.propertyNames.length; i<len; i++) {
+                        this.writeNode(
+                            "ogc:PropertyName", 
+                            {property: options.propertyNames[i]},
+                            node
+                        );
+                    }
+                }
                 if(options.filter) {
                     this.setFilterProperty(options.filter);
                     this.writeNode("ogc:Filter", options.filter, node);
diff --git a/lib/OpenLayers/Format/WFST/v1_1_0.js b/lib/OpenLayers/Format/WFST/v1_1_0.js
index c2111653e6..23b446caac 100644
--- a/lib/OpenLayers/Format/WFST/v1_1_0.js
+++ b/lib/OpenLayers/Format/WFST/v1_1_0.js
@@ -107,12 +107,26 @@ OpenLayers.Format.WFST.v1_1_0 = OpenLayers.Class(
                 if(options.featureNS) {
                     node.setAttribute("xmlns:" + options.featurePrefix, options.featureNS);
                 }
+                if(options.propertyNames) {
+                    for(var i=0,len = options.propertyNames.length; i<len; i++) {
+                        this.writeNode(
+                            "wfs:PropertyName", 
+                            {property: options.propertyNames[i]},
+                            node
+                        );
+                    }
+                }
                 if(options.filter) {
                     this.setFilterProperty(options.filter);
                     this.writeNode("ogc:Filter", options.filter, node);
                 }
                 return node;
-            }
+            },
+            "PropertyName": function(obj) {
+                return this.createElementNSPlus("wfs:PropertyName", {
+                    value: obj.property
+                });
+            }            
         }, OpenLayers.Format.WFST.v1.prototype.writers["wfs"]),
         "gml": OpenLayers.Format.GML.v3.prototype.writers["gml"],
         "feature": OpenLayers.Format.GML.v3.prototype.writers["feature"],
diff --git a/tests/Format/WFST/v1_0_0.html b/tests/Format/WFST/v1_0_0.html
index 6dca1c9f83..a3f176e77a 100644
--- a/tests/Format/WFST/v1_0_0.html
+++ b/tests/Format/WFST/v1_0_0.html
@@ -32,33 +32,44 @@
             geometryName: "the_geom"
         });
 
-        t.plan(1);
-        var snippets = {
-            "Query": {
+        var cases = [{
+            id: "query0",
+            writer: "wfs:Query",
+            arg: {
                 filter: new OpenLayers.Filter.Spatial({
                     type: OpenLayers.Filter.Spatial.BBOX,
                     value: new OpenLayers.Bounds (1,2,3,4)
-                })}
+                })
+            }
+        }, {
+            id: "getfeature0",
+            writer: "wfs:GetFeature",
+            arg: {
+                propertyNames: ["STATE_NAME", "STATE_FIPS", "STATE_ABBR"]
+            }
+        }];
+        
+        t.plan(cases.length);
+        
+        var test, got, exp;
+        for(var i=0; i<cases.length; ++i) {
+            test = cases[i];
+            exp = readXML(test.id);
+            got = format.writeNode(test.writer, test.arg);
+            t.xml_eq(got, exp, test.id + ": correct request");
         }
 
-        var arg;
-        for(var snippet in snippets) {
-            arg = snippets[snippet]
-            var expected = readXML(snippet);
-            var got = format.writers["wfs"][snippet].apply(format, [arg]);
-            t.xml_eq(got, expected, snippet + " request created correctly");
-        }
     }
 
+    var xmlFormat = new OpenLayers.Format.XML();
     function readXML(id) {
         var xml = document.getElementById(id).firstChild.nodeValue;
-        return new OpenLayers.Format.XML().read(xml).documentElement;        
+        return xmlFormat.read(xml).documentElement;        
     }
 
   </script>
 </head>
 <body>
-<div id="map" style="width:512px; height:256px"> </div>
 <div id="Transaction_Response"><!--
 <wfs:WFS_TransactionResponse version="1.0.0" xmlns:wfs="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc">
     <wfs:InsertResult>
@@ -71,7 +82,7 @@
     </wfs:TransactionResult>
 </wfs:WFS_TransactionResponse>
 --></div>
-<div id="Query"><!--
+<div id="query0"><!--
 <wfs:Query xmlns:wfs="http://www.opengis.net/wfs" typeName="topp:states" xmlns:topp="http://www.openplans.org/topp">
     <ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">
         <ogc:BBOX>
@@ -83,5 +94,18 @@
     </ogc:Filter>
 </wfs:Query>
 --></div>
+<div id="getfeature0"><!--
+<wfs:GetFeature service="WFS" version="1.0.0" xmlns:topp="http://www.openplans.org/topp"
+                xmlns:wfs="http://www.opengis.net/wfs"
+                xmlns:ogc="http://www.opengis.net/ogc"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/WFS-transaction.xsd">
+    <wfs:Query xmlns:wfs="http://www.opengis.net/wfs" typeName="topp:states" xmlns:topp="http://www.openplans.org/topp">
+        <ogc:PropertyName>STATE_NAME</ogc:PropertyName>
+        <ogc:PropertyName>STATE_FIPS</ogc:PropertyName>
+        <ogc:PropertyName>STATE_ABBR</ogc:PropertyName>
+    </wfs:Query>
+</wfs:GetFeature>
+--></div>
 </body>
 </html>
diff --git a/tests/Format/WFST/v1_1_0.html b/tests/Format/WFST/v1_1_0.html
index a9ec9cea70..78d7fe7bdf 100644
--- a/tests/Format/WFST/v1_1_0.html
+++ b/tests/Format/WFST/v1_1_0.html
@@ -32,27 +32,38 @@
             geometryName: "the_geom"
         });
 
-        t.plan(1);
-        var snippets = {
-            "Query": {
+        var cases = [{
+            id: "query0",
+            writer: "wfs:Query",
+            arg: {
                 filter: new OpenLayers.Filter.Spatial({
                     type: OpenLayers.Filter.Spatial.BBOX,
                     value: new OpenLayers.Bounds (1,2,3,4)
-                })}
-        }
-
-        var arg;
-        for(var snippet in snippets) {
-            arg = snippets[snippet]
-            var expected = readXML(snippet);
-            var got = format.writers["wfs"][snippet].apply(format, [arg]);
-            t.xml_eq(got, expected, snippet + " request created correctly");
+                })
+            }
+        }, {
+            id: "getfeature0",
+            writer: "wfs:GetFeature",
+            arg: {
+                propertyNames: ["STATE_NAME", "STATE_FIPS", "STATE_ABBR"]
+            }
+        }];
+        
+        t.plan(cases.length);
+        
+        var test, got, exp;
+        for(var i=0; i<cases.length; ++i) {
+            test = cases[i];
+            exp = readXML(test.id);
+            got = format.writeNode(test.writer, test.arg);
+            t.xml_eq(got, exp, test.id + ": correct request");
         }
     }
 
+    var xmlFormat = new OpenLayers.Format.XML();
     function readXML(id) {
         var xml = document.getElementById(id).firstChild.nodeValue;
-        return new OpenLayers.Format.XML().read(xml).documentElement;        
+        return xmlFormat.read(xml).documentElement;        
     }
 
   </script>
@@ -74,7 +85,7 @@
     </wfs:InsertResults>
 </wfs:TransactionResponse>
 --></div>
-<div id="Query"><!--
+<div id="query0"><!--
 <wfs:Query xmlns:wfs="http://www.opengis.net/wfs" typeName="topp:states" xmlns:topp="http://www.openplans.org/topp">
     <ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">
         <ogc:BBOX>
@@ -87,5 +98,18 @@
     </ogc:Filter>
 </wfs:Query>
 --></div>
+<div id="getfeature0"><!--
+<wfs:GetFeature service="WFS" version="1.1.0" xmlns:topp="http://www.openplans.org/topp"
+                xmlns:wfs="http://www.opengis.net/wfs"
+                xmlns:ogc="http://www.opengis.net/ogc"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
+    <wfs:Query xmlns:wfs="http://www.opengis.net/wfs" typeName="topp:states" xmlns:topp="http://www.openplans.org/topp">
+        <wfs:PropertyName>STATE_NAME</wfs:PropertyName>
+        <wfs:PropertyName>STATE_FIPS</wfs:PropertyName>
+        <wfs:PropertyName>STATE_ABBR</wfs:PropertyName>
+    </wfs:Query>
+</wfs:GetFeature>
+--></div>
 </body>
 </html>