diff --git a/esphome/components/sensor/ppd42x.py b/esphome/components/sensor/ppd42x.py
index 533a085453..82b13182bd 100644
--- a/esphome/components/sensor/ppd42x.py
+++ b/esphome/components/sensor/ppd42x.py
@@ -4,7 +4,7 @@ from esphome import pins
 from esphome.components import sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_NAME, CONF_PM_10_0, \
-    CONF_PM_2_5, CONF_PIN, CONF_TYPE, CONF_UPDATE_INTERVAL, CONF_TIMEOUT
+    CONF_PM_2_5, CONF_TYPE, CONF_UPDATE_INTERVAL, CONF_TIMEOUT
 from esphome.cpp_generator import Pvariable, get_variable
 from esphome.cpp_helpers import setup_component
 from esphome.cpp_types import App, Component
@@ -16,15 +16,17 @@ PPD42XSensor = sensor.sensor_ns.class_('PPD42XSensor', sensor.Sensor)
 CONF_PPD42 = 'PPD42'
 CONF_PPD42NS = 'PPD42NS'
 
+CONF_PIN_02_5 = 'pin_2_5'
+CONF_PIN_10_0 = 'pin_10_0'
+
 PPD42XType = sensor.sensor_ns.enum('PPD42XType')
 PPD42X_TYPES = {
     CONF_PPD42: PPD42XType.PPD42X_TYPE,
     CONF_PPD42NS: PPD42XType.PPD42X_TYPE_NS,
 }
-
 SENSORS_TO_TYPE = {
-    CONF_PM_2_5:  [CONF_PPD42, CONF_PPD42NS],
-    CONF_PM_10_0: [CONF_PPD42, CONF_PPD42NS],
+    CONF_PIN_02_5: [CONF_PPD42, CONF_PPD42NS],
+    CONF_PIN_10_0: [CONF_PPD42, CONF_PPD42NS],
 }
 
 
@@ -38,24 +40,24 @@ def validate_PPD42X_sensors(value):
 PLATFORM_SCHEMA = cv.nameable(sensor.PLATFORM_SCHEMA.extend({
     cv.GenerateID(): cv.declare_variable_id(PPD42XComponent),
     vol.Required(CONF_TYPE): cv.one_of(*PPD42X_TYPES, upper=True),
-    vol.Optional(CONF_PM_2_5): pins.gpio_input_pin_schema,
-    vol.Optional(CONF_PM_10_0): pins.gpio_input_pin_schema,
+    vol.Optional(CONF_PIN_02_5): pins.gpio_input_pin_schema,
+    vol.Optional(CONF_PIN_10_0): pins.gpio_input_pin_schema,
     vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
     vol.Optional(CONF_TIMEOUT): cv.positive_time_period_microseconds,
-}).extend(cv.COMPONENT_SCHEMA.schema), cv.has_at_least_one_key(*SENSORS_TO_TYPE))
+}).extend(cv.COMPONENT_SCHEMA.schema))
 
 
 def to_code(config):
     rhs = App.make_ppd42x(PPD42X_TYPES[config[CONF_TYPE]])
     ppd = Pvariable(config[CONF_ID], rhs)
     if CONF_PM_2_5 in config:
-        for pm_02_5 in get_variable(config.get(CONF_PM_2_5)):
+        for pm_02_5 in get_variable(config.get(CONF_PIN_02_5)):
             yield
-        sensor.register_sensor(ppd.make_pm_02_5_sensor(conf_02_5[CONF_NAME]), pm_02_5)
+        sensor.register_sensor(ppd.make_pm_02_5_sensor(config[CONF_NAME]), pm_02_5)
     if CONF_PM_10_0 in config:
-        for pm_10_0 in get_variable(config.get(CONF_PM_10_0):
+        for pm_10_0 in get_variable(config.get(CONF_PM_10_0)):
             yield
-        sensor.register_sensor(ppd.make_pm_10_0_sensor(conf_10_0[CONF_NAME]), pm_10_0)
+        sensor.register_sensor(ppd.make_pm_10_0_sensor(config[CONF_NAME]), pm_10_0)
     setup_component(ppd, config)
 
 
diff --git a/tests/test1.yaml b/tests/test1.yaml
index f421847ff1..e1361287e3 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -505,12 +505,8 @@ sensor:
   - platform: ppd42x
     id: my_office_ppd42
     type: PPD42
-    pm_2_5:
-      pin: GPIO32
-      name: "ppd42 PM2.5"
-    pm_10_0:
-      pin: GPIO35
-      name: "ppd42 PM10.0"
+    pin_2_5: GPIO32
+    pin_10_0: GPIO35
     update_interval: 5min
     timeout: 30000us # default value