diff --git a/examples/wiring-blink/platformio.ini b/examples/wiring-blink/platformio.ini
index a1445967..33d4a63f 100644
--- a/examples/wiring-blink/platformio.ini
+++ b/examples/wiring-blink/platformio.ini
@@ -5,22 +5,22 @@
 ; http://docs.platformio.org/en/latest/projectconf.html
 ;
 
-[env:autogen_uno]
+[env:uno]
 platform = atmelavr
 framework = arduino
 board = uno
 
-[env:autogen_teensy31]
+[env:teensy31]
 platform = teensy
 framework = arduino
 board = teensy31
 
-[env:autogen_lpmsp430g2553]
+[env:lpmsp430g2553]
 platform = timsp430
 framework = energia
 board = lpmsp430g2553
 
-[env:autogen_lptm4c1230c3pm]
+[env:lptm4c1230c3pm]
 platform = titiva
 framework = energia
 board = lptm4c1230c3pm
diff --git a/tests/commands/test_init.py b/tests/commands/test_init.py
index d951f760..d354982e 100644
--- a/tests/commands/test_init.py
+++ b/tests/commands/test_init.py
@@ -46,9 +46,9 @@ def test_init_special_board(platformio_setup, clirunner, validate_cliresult):
             ("targets", "upload")
         ]
 
-        assert config.has_section("env:autogen_uno")
+        assert config.has_section("env:uno")
         assert len(set(expected_result).symmetric_difference(
-            set(config.items("env:autogen_uno")))) == 0
+            set(config.items("env:uno")))) == 0
 
 
 def test_init_disable_auto_uploading(platformio_setup, clirunner,
@@ -64,9 +64,9 @@ def test_init_disable_auto_uploading(platformio_setup, clirunner,
             ("framework", "arduino"),
             ("board", "uno")
         ]
-        assert config.has_section("env:autogen_uno")
+        assert config.has_section("env:uno")
         assert len(set(expected_result).symmetric_difference(
-            set(config.items("env:autogen_uno")))) == 0
+            set(config.items("env:uno")))) == 0
 
 
 def test_init_incorrect_board(clirunner):