gistfile1.txt

diff --git a/autotest/ogr/ogr_nas.py b/autotest/ogr/ogr_nas.py
index 784fc9b6f2..cd88bdd20b 100755
--- a/autotest/ogr/ogr_nas.py
+++ b/autotest/ogr/ogr_nas.py
@@ -147,7 +147,7 @@ def ogr_nas_2():
 
     # Loop until a feature that has a complex geometry including <gml:Arc>
     feat = lyr.GetNextFeature()
-    while feat is not None and feat.GetField('identifier') != 'urn:adv:oid:DERP1234000002Iz':
+    while feat is not None and feat.GetField('gml_id')[:16] != 'DERP1234000002Iz':
         feat = lyr.GetNextFeature()
     if feat is None:
         return 'fail'
@@ -319,8 +319,9 @@ def ogr_nas_5():
         gdaltest.post_reason('did not get expected gml_id')
         return 'fail'
 
-    if feat.GetField('stelle') != 5212:
-        gdaltest.post_reason('did not get expected stelle')
+    field = feat.GetField('zustaendigestelle_stelle')
+    if not isinstance(field, list) or len(field)!=1 or field[0] != '5212':
+        gdaltest.post_reason('did not get expected zustaendigestelle_stelle')
         return 'fail'
 
     lyr = None
@@ -343,6 +344,10 @@ gdaltest_list = [
     ogr_nas_5]
 
 if __name__ == '__main__':
+    os.putenv("NAS_INDICATOR", "NAS-Operationen;AAA-Fachschema;aaa.xsd;aaa-suite")
+
+    if gdaltest.download_file('https://github.com/norBIT/alkisimport/raw/master/alkis-schema.gfs', 'alkis-schema.gfs'):
+        os.putenv("NAS_GFS_TEMPLATE", "tmp/cache/alkis-schema.gfs")
 
     gdaltest.setup_run('ogr_nas')