diff --git a/ophyd/positioner.py b/ophyd/positioner.py
index 95482490..33b7dead 100644
--- a/ophyd/positioner.py
+++ b/ophyd/positioner.py
@@ -1,6 +1,7 @@
 import functools
 import logging
 import time
+from abc import ABCMeta, abstractmethod
 from collections import OrderedDict
 from typing import Any, Callable
 
@@ -13,18 +14,11 @@
 logger = logging.getLogger(__name__)
 
 
-class PositionerBase(OphydObject):
+class PositionerBase(OphydObject, metaclass=ABCMeta):
     """The positioner base class
 
     Subclass from this to implement your own positioners.
 
-    .. note ::
-
-       Subclasses should add an additional 'wait' keyword argument on
-       the move method. The `MoveStatus` object returned from
-       `PositionerBase` can then be waited on after the subclass
-       finishes the motion configuration.
-
     """
 
     SUB_START = "start_moving"
@@ -136,9 +130,10 @@ def report(self):
         return rep
 
     @property
+    @abstractmethod
     def egu(self):
         """The engineering units (EGU) for positions"""
-        raise NotImplementedError("Subclass must implement egu")
+        pass
 
     @property
     def limits(self):
@@ -152,6 +147,7 @@ def low_limit(self):
     def high_limit(self):
         return self.limits[1]
 
+    @abstractmethod
     def move(self, position, wait=False, moved_cb=None, timeout=None):
         """Move to a specified position, optionally waiting for motion to
         complete.
@@ -210,6 +206,9 @@ def move(self, position, wait=False, moved_cb=None, timeout=None):
 
         self.subscribe(status._finished, event_type=self._SUB_REQ_DONE, run=False)
 
+        if wait:
+            status.wait()
+
         return status
 
     def _done_moving(self, success=True, timestamp=None, value=None, **kwargs):