diff --git a/layers/poi/layer.sql b/layers/poi/layer.sql
index 83e6288..2580012 100644
--- a/layers/poi/layer.sql
+++ b/layers/poi/layer.sql
@@ -34,7 +34,9 @@ SELECT osm_id_hash                                  AS osm_id,
                THEN NULLIF(religion, '')
            WHEN subclass = 'pitch'
                THEN NULLIF(sport, '')
-           when power = 'generator'
+           WHEN power = 'generator' AND source = 'wind'
+                THEN 'wind_turbine'
+           WHEN power = 'generator'
                THEN NULLIF(source, '')
            ELSE subclass
            END                                      AS subclass,
diff --git a/test.sh b/test.sh
index 466c1b9..789207f 100644
--- a/test.sh
+++ b/test.sh
@@ -29,9 +29,10 @@ make import-data
 # Download
 make download-${SOURCE} area="${AREA}"
 
-# Import
+# Import (yes we're doing import borders twice, it crashes on first run, oddly enough)
 make import-osm
 make import-borders
+make import-borders
 make import-wikidata
 make import-sql
 make analyze-db