diff --git a/oslo/messaging/_executors/__init__.py b/oslo/messaging/_executors/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/oslo/messaging/_executors/base.py b/oslo/messaging/_executors/base.py
new file mode 100644
index 000000000..01dfc0677
--- /dev/null
+++ b/oslo/messaging/_executors/base.py
@@ -0,0 +1,17 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from oslo_messaging._executors.base import *  # noqa
+
+# FIXME(dhellmann): Provide a dummy value so the mock in nova's unit
+# test fixture works. See bug #1412841
+POLL_TIMEOUT = 0.1
diff --git a/oslo/messaging/notify/_impl_test.py b/oslo/messaging/notify/_impl_test.py
new file mode 100644
index 000000000..4e3caf77d
--- /dev/null
+++ b/oslo/messaging/notify/_impl_test.py
@@ -0,0 +1,13 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from oslo_messaging.notify._impl_test import *  # noqa