diff --git a/homeassistant/components/device_tracker/owntracks.py b/homeassistant/components/device_tracker/owntracks.py
index 93d217da5cf..612f9423a38 100644
--- a/homeassistant/components/device_tracker/owntracks.py
+++ b/homeassistant/components/device_tracker/owntracks.py
@@ -30,6 +30,7 @@ _LOGGER = logging.getLogger(__name__)
 LOCK = threading.Lock()
 
 CONF_MAX_GPS_ACCURACY = 'max_gps_accuracy'
+CONF_WAYPOINT_IMPORT_USER = 'waypoint_import_user'
 
 VALIDATE_LOCATION = 'location'
 VALIDATE_TRANSITION = 'transition'
diff --git a/tests/components/device_tracker/test_owntracks.py b/tests/components/device_tracker/test_owntracks.py
index e998afdd9c0..4abad8b6ca1 100644
--- a/tests/components/device_tracker/test_owntracks.py
+++ b/tests/components/device_tracker/test_owntracks.py
@@ -562,6 +562,6 @@ class TestDeviceTrackerOwnTracks(unittest.TestCase):
         self.send_message(WAYPOINT_TOPIC, waypoints_message)
         # Check if it made it into states
         wayp = self.hass.states.get('zone.exp_wayp1')
-        self.assertTrue(wayp != None)
+        self.assertTrue(wayp is not None)
         wayp = self.hass.states.get('zone.exp_wayp2')
-        self.assertTrue(wayp != None)
+        self.assertTrue(wayp is not None)