diff --git a/src/lib/render.jsx b/src/lib/render.jsx
index b7a6323d3..bc2309b26 100644
--- a/src/lib/render.jsx
+++ b/src/lib/render.jsx
@@ -39,6 +39,7 @@ const render = (jsx, element, reducers, initialState, enhancer) => {
                 <IntlProvider
                     locale={intlLocale}
                     messages={messages}
+                    textComponent="span"
                 >
                     {jsx}
                 </IntlProvider>
diff --git a/test/helpers/intl-helpers.jsx b/test/helpers/intl-helpers.jsx
index 1ca728b79..43bbfb7c3 100644
--- a/test/helpers/intl-helpers.jsx
+++ b/test/helpers/intl-helpers.jsx
@@ -39,7 +39,12 @@ const mountWithIntl = (node, {context, childContextTypes} = {}) => {
 
 // react-test-renderer component for use with snapshot testing
 const componentWithIntl = (children, props = {locale: 'en'}) => renderer.create(
-    <IntlProvider {...props}>{children}</IntlProvider>
+    <IntlProvider
+        textComponent="span"
+        {...props}
+    >
+        {children}
+    </IntlProvider>
 );
 
 export {