diff --git a/oslo/messaging/_drivers/__init__.py b/oslo/messaging/_drivers/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/oslo/messaging/_drivers/common.py b/oslo/messaging/_drivers/common.py
new file mode 100644
index 000000000..12f8b095c
--- /dev/null
+++ b/oslo/messaging/_drivers/common.py
@@ -0,0 +1,16 @@
+#    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.
+
+# TODO(dhellmann): This private package and these imports can be
+# removed after heat fixes their tests. See
+# https://bugs.launchpad.net/oslo.messaging/+bug/1410196.
+from oslo_messaging._drivers.common import *  # noqa