diff --git a/src/lib/find-vue-components.js b/src/lib/find-vue-components.js
index b43ffc670..aa25abb69 100644
--- a/src/lib/find-vue-components.js
+++ b/src/lib/find-vue-components.js
@@ -1,6 +1,5 @@
 // @flow
 import {
-  COMPONENT_SELECTOR,
   FUNCTIONAL_OPTIONS,
   VUE_VERSION
 } from './consts'
@@ -52,15 +51,20 @@ function findAllFunctionalComponentsFromVnode (
 }
 
 export function vmCtorMatchesName (vm: Component, name: string): boolean {
-  return (vm.$vnode && vm.$vnode.componentOptions &&
+  return !!((vm.$vnode && vm.$vnode.componentOptions &&
     vm.$vnode.componentOptions.Ctor.options.name === name) ||
-    (vm._vnode && vm._vnode.functionalOptions &&
-      vm._vnode.functionalOptions.name === name) ||
-        vm.$options && vm.$options.name === name
+    (vm._vnode &&
+    vm._vnode.functionalOptions &&
+    vm._vnode.functionalOptions.name === name) ||
+    vm.$options && vm.$options.name === name ||
+    vm.options && vm.options.name === name)
 }
 
 export function vmCtorMatchesSelector (component: Component, selector: Object) {
-  const Ctor = selector._Ctor || selector.options && selector.options._Ctor
+  const Ctor = selector._Ctor || (selector.options && selector.options._Ctor)
+  if (!Ctor) {
+    return false
+  }
   const Ctors = Object.keys(Ctor)
   return Ctors.some(c => Ctor[c] === component.__proto__.constructor)
 }
@@ -95,6 +99,7 @@ export default function findVueComponents (
       node[FUNCTIONAL_OPTIONS].name === selector.name
     )
   }
+  const nameSelector = typeof selector === 'function' ? selector.options.name : selector.name
   const components = root._isVue
     ? findAllVueComponentsFromVm(root)
     : findAllVueComponentsFromVnode(root)
@@ -102,8 +107,6 @@ export default function findVueComponents (
     if (!component.$vnode && !component.$options.extends) {
       return false
     }
-    return selectorType === COMPONENT_SELECTOR
-      ? vmCtorMatchesSelector(component, selector)
-      : vmCtorMatchesName(component, selector.name)
+    return vmCtorMatchesSelector(component, selector) || vmCtorMatchesName(component, nameSelector)
   })
 }
diff --git a/test/resources/components/component-as-a-class.vue b/test/resources/components/component-as-a-class.vue
index f92e973d2..e8357be48 100644
--- a/test/resources/components/component-as-a-class.vue
+++ b/test/resources/components/component-as-a-class.vue
@@ -1,5 +1,5 @@
 <template>
-  <div />
+  <div><slot /></div>
 </template>
 
 <script>
diff --git a/test/resources/test-utils.js b/test/resources/test-utils.js
index e6f502b16..5350ccb8b 100644
--- a/test/resources/test-utils.js
+++ b/test/resources/test-utils.js
@@ -46,3 +46,11 @@ export function itSkipIf (predicate, spec, cb) {
     it(spec, cb)
   }
 }
+
+export function itDoNotRunIf (predicate, spec, cb) {
+  if (predicate) {
+    () => {}
+  } else {
+    it(spec, cb)
+  }
+}
diff --git a/test/specs/mounting-options/attachToDocument.spec.js b/test/specs/mounting-options/attachToDocument.spec.js
index 63b9fa837..82f73bdca 100644
--- a/test/specs/mounting-options/attachToDocument.spec.js
+++ b/test/specs/mounting-options/attachToDocument.spec.js
@@ -1,10 +1,10 @@
 import { compileToFunctions } from 'vue-template-compiler'
-import { mount } from '~vue-test-utils'
+import { describeWithShallowAndMount } from '~resources/test-utils'
 
-describe('mount.attachToDocument', () => {
+describeWithShallowAndMount('options.attachToDocument', (mountingMethod) => {
   it('returns VueWrapper with attachedToDocument set to true when passed attachToDocument in options', () => {
     const compiled = compileToFunctions('<div><input /></div>')
-    const wrapper = mount(compiled, { attachToDocument: true })
+    const wrapper = mountingMethod(compiled, { attachToDocument: true })
     expect(wrapper.options.attachedToDocument).to.equal(true)
   })
 })
diff --git a/test/specs/mounting-options/attrs.spec.js b/test/specs/mounting-options/attrs.spec.js
index 5008133c2..8eb82b038 100644
--- a/test/specs/mounting-options/attrs.spec.js
+++ b/test/specs/mounting-options/attrs.spec.js
@@ -1,11 +1,11 @@
 import { compileToFunctions } from 'vue-template-compiler'
-import { mount } from '~vue-test-utils'
 import { attrsSupported } from '~resources/test-utils'
+import { describeWithShallowAndMount } from '~resources/test-utils'
 
-describe('mount.attrs', () => {
+describeWithShallowAndMount('options.attrs', (mountingMethod) => {
   it('handles inherit attrs', () => {
     if (!attrsSupported()) return
-    const wrapper = mount(compileToFunctions('<p :id="anAttr" />'), {
+    const wrapper = mountingMethod(compileToFunctions('<p :id="anAttr" />'), {
       attrs: {
         anAttr: 'an attribute'
       }
@@ -16,7 +16,7 @@ describe('mount.attrs', () => {
   })
 
   it('defines attrs as empty object even when not passed', () => {
-    const wrapper = mount(compileToFunctions('<p />'))
+    const wrapper = mountingMethod(compileToFunctions('<p />'))
     expect(wrapper.vm.$attrs).to.deep.equal({})
   })
 })
diff --git a/test/specs/mounting-options/context.spec.js b/test/specs/mounting-options/context.spec.js
index 4ef1d9d07..63730eb92 100644
--- a/test/specs/mounting-options/context.spec.js
+++ b/test/specs/mounting-options/context.spec.js
@@ -1,8 +1,8 @@
 import Vue from 'vue'
-import { mount } from '~vue-test-utils'
 import { vueVersion } from '~resources/test-utils'
+import { describeWithShallowAndMount } from '~resources/test-utils'
 
-describe('context', () => {
+describeWithShallowAndMount('options.context', (mountingMethod) => {
   it('mounts functional component when passed context object', () => {
     if (vueVersion <= 2.2) {
       console.log('WARN: no current way to test functional component is component in v2.1.x')
@@ -21,7 +21,7 @@ describe('context', () => {
       props: { show: true }
     }
 
-    const wrapper = mount(Component, { context })
+    const wrapper = mountingMethod(Component, { context })
     expect(wrapper.is(Component)).to.equal(true)
   })
 
@@ -31,7 +31,7 @@ describe('context', () => {
     }
     const context = {}
     const message = '[vue-test-utils]: mount.context can only be used when mounting a functional component'
-    const fn = () => mount(Component, { context })
+    const fn = () => mountingMethod(Component, { context })
     expect(fn).to.throw().with.property('message', message)
   })
 
@@ -41,7 +41,7 @@ describe('context', () => {
       render: h => h('div')
     })
     const context = {}
-    const fn = () => mount(Component, { context })
+    const fn = () => mountingMethod(Component, { context })
     expect(fn).not.to.throw()
   })
 
@@ -52,7 +52,7 @@ describe('context', () => {
     }
     const context = 'string'
     const message = '[vue-test-utils]: mount.context must be an object'
-    const fn = () => mount(Component, { context })
+    const fn = () => mountingMethod(Component, { context })
     expect(fn).to.throw().with.property('message', message)
   })
 
@@ -68,7 +68,7 @@ describe('context', () => {
       },
       render: (h, { props }) => h('div', props.testProp)
     }
-    const wrapper = mount(Component)
+    const wrapper = mountingMethod(Component)
     expect(wrapper.element.textContent).to.equal(defaultValue)
   })
 
@@ -79,7 +79,7 @@ describe('context', () => {
         return h('div', children)
       }
     }
-    const wrapper = mount(Component, {
+    const wrapper = mountingMethod(Component, {
       context: {
         children: ['render text']
       }
@@ -94,7 +94,7 @@ describe('context', () => {
         return h('div', children)
       }
     }
-    const wrapper = mount(Component, {
+    const wrapper = mountingMethod(Component, {
       context: {
         children: [h => h('div', 'render component')]
       }
diff --git a/test/specs/mounting-options/listeners.spec.js b/test/specs/mounting-options/listeners.spec.js
index 2d4158e6b..5d09daf2e 100644
--- a/test/specs/mounting-options/listeners.spec.js
+++ b/test/specs/mounting-options/listeners.spec.js
@@ -1,12 +1,12 @@
 import { compileToFunctions } from 'vue-template-compiler'
-import { mount } from '~vue-test-utils'
 import { listenersSupported } from '~resources/test-utils'
+import { describeWithShallowAndMount } from '~resources/test-utils'
 
-describe('mount.listeners', () => {
+describeWithShallowAndMount('options.listeners', (mountingMethod) => {
   it('handles inherit listeners', () => {
     if (!listenersSupported()) return
     const aListener = () => {}
-    const wrapper = mount(compileToFunctions('<p :id="aListener" />'), {
+    const wrapper = mountingMethod(compileToFunctions('<p :id="aListener" />'), {
       listeners: {
         aListener
       }
@@ -18,7 +18,7 @@ describe('mount.listeners', () => {
   })
 
   it('defines listeners as empty object even when not passed', () => {
-    const wrapper = mount(compileToFunctions('<p />'))
+    const wrapper = mountingMethod(compileToFunctions('<p />'))
     expect(wrapper.vm.$listeners).to.deep.equal({})
   })
 })
diff --git a/test/specs/mounting-options/localVue.spec.js b/test/specs/mounting-options/localVue.spec.js
index a4d35d3e1..43ed502b5 100644
--- a/test/specs/mounting-options/localVue.spec.js
+++ b/test/specs/mounting-options/localVue.spec.js
@@ -1,15 +1,14 @@
 import Vue from 'vue'
-import { mount } from '~vue-test-utils'
 import Component from '~resources/components/component.vue'
+import { describeWithShallowAndMount } from '~resources/test-utils'
 
-describe('mount.localVue', () => {
+describeWithShallowAndMount('options.localVue', (mountingMethod) => {
   it('mounts component using passed localVue as base Vue', () => {
     const localVue = Vue.extend()
     localVue.version = '2.3'
-    const wrapper = mount(Component, { localVue: localVue, mocks: { test: true }})
+    const wrapper = mountingMethod(Component, { localVue: localVue, mocks: { test: true }})
     expect(wrapper.vm.test).to.equal(true)
-    const freshWrapper = mount(Component)
+    const freshWrapper = mountingMethod(Component)
     expect(typeof freshWrapper.vm.test).to.equal('undefined')
   })
 })
-
diff --git a/test/specs/mounting-options/mocks.spec.js b/test/specs/mounting-options/mocks.spec.js
index c175495e8..4e047f727 100644
--- a/test/specs/mounting-options/mocks.spec.js
+++ b/test/specs/mounting-options/mocks.spec.js
@@ -1,13 +1,16 @@
-import { mount } from '~vue-test-utils'
 import { createLocalVue } from '~vue-test-utils'
 import Component from '~resources/components/component.vue'
 import ComponentWithVuex from '~resources/components/component-with-vuex.vue'
+import {
+  describeWithShallowAndMount,
+  itDoNotRunIf
+ } from '~resources/test-utils'
 
-describe('mount.mocks', () => {
+describeWithShallowAndMount('options.mocks', (mountingMethod) => {
   it('adds variables to vm when passed as mocks object', () => {
     const $store = { store: true }
     const $route = { path: 'http://test.com' }
-    const wrapper = mount(Component, {
+    const wrapper = mountingMethod(Component, {
       mocks: {
         $store,
         $route
@@ -20,7 +23,7 @@ describe('mount.mocks', () => {
   it('adds variables to vm when passed as mocks object', () => {
     const stub = sinon.stub()
     const $reactiveMock = { value: 'value' }
-    const wrapper = mount({
+    const wrapper = mountingMethod({
       template: `
         <div>
           {{value}}
@@ -45,23 +48,25 @@ describe('mount.mocks', () => {
     expect(wrapper.text()).to.contain('changed value')
   })
 
-  it('adds variables available to nested vms', () => {
-    const count = 1
-    const wrapper = mount({
-      template: '<div><component-with-vuex /></div>',
-      components: {
-        ComponentWithVuex
-      }
-    }, {
-      mocks: { $store: { state: { count, foo: {}}}}
+  itDoNotRunIf(mountingMethod.name === 'shallow',
+    'adds variables available to nested vms', () => {
+      const count = 1
+      const wrapper = mountingMethod({
+        template: '<div><component-with-vuex /></div>',
+        components: {
+          ComponentWithVuex
+        }
+      }, {
+        mocks: { $store: { state: { count, foo: {}}}}
+      })
+      expect(wrapper.text()).contains(count)
     })
-    expect(wrapper.text()).contains(count)
-  })
 
-  it('adds variables available to nested vms using localVue', () => {
+  itDoNotRunIf(mountingMethod.name === 'shallow',
+  'adds variables available to nested vms using localVue', () => {
     const localVue = createLocalVue()
     const count = 1
-    const wrapper = mount({
+    const wrapper = mountingMethod({
       template: '<div><component-with-vuex /></div>',
       components: {
         ComponentWithVuex
@@ -75,13 +80,13 @@ describe('mount.mocks', () => {
 
   it('does not affect global vue class when passed as mocks object', () => {
     const $store = { store: true }
-    const wrapper = mount(Component, {
+    const wrapper = mountingMethod(Component, {
       mocks: {
         $store
       }
     })
     expect(wrapper.vm.$store).to.equal($store)
-    const freshWrapper = mount(Component)
+    const freshWrapper = mountingMethod(Component)
     expect(typeof freshWrapper.vm.$store).to.equal('undefined')
   })
 
@@ -92,7 +97,7 @@ describe('mount.mocks', () => {
       value: 42
     })
     const $store = 64
-    mount(Component, {
+    mountingMethod(Component, {
       localVue,
       mocks: {
         $store
@@ -110,7 +115,7 @@ describe('mount.mocks', () => {
       value: 42
     })
     const $val = 64
-    mount(Component, {
+    mountingMethod(Component, {
       localVue,
       mocks: {
         $val
diff --git a/test/specs/mounting-options/provide.spec.js b/test/specs/mounting-options/provide.spec.js
index 5e336dd59..2ca2fe94a 100644
--- a/test/specs/mounting-options/provide.spec.js
+++ b/test/specs/mounting-options/provide.spec.js
@@ -1,8 +1,9 @@
 import { mount } from '~vue-test-utils'
 import ComponentWithInject from '~resources/components/component-with-inject.vue'
 import { injectSupported } from '~resources/test-utils'
+import { describeWithShallowAndMount } from '~resources/test-utils'
 
-describe('mount.provide', () => {
+describeWithShallowAndMount('options.provide', (mountingMethod) => {
   it('provides objects which is injected by mounted component', () => {
     if (!injectSupported()) return
 
@@ -16,7 +17,7 @@ describe('mount.provide', () => {
   it('provides function which is injected by mounted component', () => {
     if (!injectSupported()) return
 
-    const wrapper = mount(ComponentWithInject, {
+    const wrapper = mountingMethod(ComponentWithInject, {
       provide () {
         return {
           fromMount: 'functionValue'
@@ -30,7 +31,7 @@ describe('mount.provide', () => {
   it('supports beforeCreate in component', () => {
     if (!injectSupported()) return
 
-    const wrapper = mount(ComponentWithInject, {
+    const wrapper = mountingMethod(ComponentWithInject, {
       provide: { fromMount: '_' }
     })
 
diff --git a/test/specs/mounting-options/slots.spec.js b/test/specs/mounting-options/slots.spec.js
index 92a983a0f..bad0e0c99 100644
--- a/test/specs/mounting-options/slots.spec.js
+++ b/test/specs/mounting-options/slots.spec.js
@@ -1,9 +1,13 @@
 import { compileToFunctions } from 'vue-template-compiler'
-import { mount } from '~vue-test-utils'
 import Component from '~resources/components/component.vue'
 import ComponentWithSlots from '~resources/components/component-with-slots.vue'
+import ComponentAsAClass from '~resources/components/component-as-a-class.vue'
+import {
+  describeWithShallowAndMount,
+  vueVersion
+ } from '~resources/test-utils'
 
-describe('mount.slots', () => {
+describeWithShallowAndMount('options.slots', (mountingMethod) => {
   let _window
 
   beforeEach(() => {
@@ -17,23 +21,31 @@ describe('mount.slots', () => {
   })
 
   it('mounts component with default slot if passed component in slot object', () => {
-    const wrapper = mount(ComponentWithSlots, { slots: { default: Component }})
+    const wrapper = mountingMethod(ComponentWithSlots, { slots: { default: Component }})
     expect(wrapper.contains(Component)).to.equal(true)
   })
 
   it('mounts component with default slot if passed component in array in slot object', () => {
-    const wrapper = mount(ComponentWithSlots, { slots: { default: [Component] }})
+    const wrapper = mountingMethod(ComponentWithSlots, { slots: { default: [Component] }})
     expect(wrapper.contains(Component)).to.equal(true)
   })
 
   it('mounts component with default slot if passed object with template prop in slot object', () => {
     const compiled = compileToFunctions('<div id="div" />')
-    const wrapper = mount(ComponentWithSlots, { slots: { default: [compiled] }})
+    const wrapper = mountingMethod(ComponentWithSlots, { slots: { default: [compiled] }})
     expect(wrapper.contains('#div')).to.equal(true)
   })
 
   it('mounts component with default slot if passed string in slot object', () => {
-    const wrapper = mount(ComponentWithSlots, { slots: { default: '<span />' }})
+    const wrapper = mountingMethod(ComponentWithSlots, { slots: { default: '<span />' }})
+    expect(wrapper.contains('span')).to.equal(true)
+  })
+
+  it('works correctly with class component', () => {
+    if (vueVersion < 2.3) {
+      return
+    }
+    const wrapper = mountingMethod(ComponentAsAClass, { slots: { default: '<span />' }})
     expect(wrapper.contains('span')).to.equal(true)
   })
 
@@ -43,36 +55,36 @@ describe('mount.slots', () => {
     }
     window = { navigator: { userAgent: 'PhantomJS' }} // eslint-disable-line no-native-reassign
     const message = '[vue-test-utils]: option.slots does not support strings in PhantomJS. Please use Puppeteer, or pass a component'
-    const fn = () => mount(ComponentWithSlots, { slots: { default: 'foo' }})
+    const fn = () => mountingMethod(ComponentWithSlots, { slots: { default: 'foo' }})
     expect(fn).to.throw().with.property('message', message)
   })
 
   it('mounts component with default slot if passed string in slot object', () => {
-    const wrapper1 = mount(ComponentWithSlots, { slots: { default: 'foo<span>123</span>{{ foo }}' }})
+    const wrapper1 = mountingMethod(ComponentWithSlots, { slots: { default: 'foo<span>123</span>{{ foo }}' }})
     expect(wrapper1.find('main').html()).to.equal('<main>foo<span>123</span>bar</main>')
-    const wrapper2 = mount(ComponentWithSlots, { slots: { default: '<p>1</p>{{ foo }}2' }})
+    const wrapper2 = mountingMethod(ComponentWithSlots, { slots: { default: '<p>1</p>{{ foo }}2' }})
     expect(wrapper2.find('main').html()).to.equal('<main><p>1</p>bar2</main>')
-    const wrapper3 = mount(ComponentWithSlots, { slots: { default: '<p>1</p>{{ foo }}<p>2</p>' }})
+    const wrapper3 = mountingMethod(ComponentWithSlots, { slots: { default: '<p>1</p>{{ foo }}<p>2</p>' }})
     expect(wrapper3.find('main').html()).to.equal('<main><p>1</p>bar<p>2</p></main>')
-    const wrapper4 = mount(ComponentWithSlots, { slots: { default: '123' }})
+    const wrapper4 = mountingMethod(ComponentWithSlots, { slots: { default: '123' }})
     expect(wrapper4.find('main').html()).to.equal('<main>123</main>')
-    const wrapper5 = mount(ComponentWithSlots, { slots: { default: '1{{ foo }}2' }})
+    const wrapper5 = mountingMethod(ComponentWithSlots, { slots: { default: '1{{ foo }}2' }})
     expect(wrapper5.find('main').html()).to.equal('<main>1bar2</main>')
     wrapper5.trigger('keydown')
     expect(wrapper5.find('main').html()).to.equal('<main>1BAR2</main>')
-    const wrapper6 = mount(ComponentWithSlots, { slots: { default: '<p>1</p><p>2</p>' }})
+    const wrapper6 = mountingMethod(ComponentWithSlots, { slots: { default: '<p>1</p><p>2</p>' }})
     expect(wrapper6.find('main').html()).to.equal('<main><p>1</p><p>2</p></main>')
-    const wrapper7 = mount(ComponentWithSlots, { slots: { default: '1<p>2</p>3' }})
+    const wrapper7 = mountingMethod(ComponentWithSlots, { slots: { default: '1<p>2</p>3' }})
     expect(wrapper7.find('main').html()).to.equal('<main>1<p>2</p>3</main>')
   })
 
   it('throws error if passed string in default slot object and vue-template-compiler is undefined', () => {
     const compilerSave = require.cache[require.resolve('vue-template-compiler')].exports.compileToFunctions
     require.cache[require.resolve('vue-template-compiler')].exports.compileToFunctions = undefined
-    delete require.cache[require.resolve('../../../src/mount')]
-    const mountFresh = require('../../../src/mount').default
+    delete require.cache[require.resolve('../../../dist/vue-test-utils')]
+    const mountingMethodFresh = require('../../../dist/vue-test-utils')[mountingMethod.name]
     const message = '[vue-test-utils]: vueTemplateCompiler is undefined, you must pass components explicitly if vue-template-compiler is undefined'
-    const fn = () => mountFresh(ComponentWithSlots, { slots: { default: '<span />' }})
+    const fn = () => mountingMethodFresh(ComponentWithSlots, { slots: { default: '<span />' }})
     try {
       expect(fn).to.throw().with.property('message', message)
     } catch (err) {
@@ -83,22 +95,22 @@ describe('mount.slots', () => {
   })
 
   it('mounts component with default slot if passed string in slot array object', () => {
-    const wrapper = mount(ComponentWithSlots, { slots: { default: ['<span />'] }})
+    const wrapper = mountingMethod(ComponentWithSlots, { slots: { default: ['<span />'] }})
     expect(wrapper.contains('span')).to.equal(true)
   })
 
   it('mounts component with default slot if passed string in slot text array object', () => {
-    const wrapper = mount(ComponentWithSlots, { slots: { default: ['{{ foo }}<span>1</span>', 'bar'] }})
+    const wrapper = mountingMethod(ComponentWithSlots, { slots: { default: ['{{ foo }}<span>1</span>', 'bar'] }})
     expect(wrapper.find('main').html()).to.equal('<main>bar<span>1</span>bar</main>')
   })
 
   it('throws error if passed string in default slot array vue-template-compiler is undefined', () => {
     const compilerSave = require.cache[require.resolve('vue-template-compiler')].exports.compileToFunctions
     require.cache[require.resolve('vue-template-compiler')].exports.compileToFunctions = undefined
-    delete require.cache[require.resolve('../../../src/mount')]
-    const mountFresh = require('../../../src/mount').default
+    delete require.cache[require.resolve('../../../dist/vue-test-utils')]
+    const mountingMethodFresh = require('../../../dist/vue-test-utils')[mountingMethod.name]
     const message = '[vue-test-utils]: vueTemplateCompiler is undefined, you must pass components explicitly if vue-template-compiler is undefined'
-    const fn = () => mountFresh(ComponentWithSlots, { slots: { default: ['<span />'] }})
+    const fn = () => mountingMethodFresh(ComponentWithSlots, { slots: { default: ['<span />'] }})
     try {
       expect(fn).to.throw().with.property('message', message)
     } catch (err) {
@@ -109,7 +121,7 @@ describe('mount.slots', () => {
   })
 
   it('mounts component with named slot if passed component in slot object', () => {
-    const wrapper = mount(ComponentWithSlots, {
+    const wrapper = mountingMethod(ComponentWithSlots, {
       slots: {
         header: [Component],
         footer: [Component]
@@ -119,7 +131,7 @@ describe('mount.slots', () => {
   })
 
   it('mounts component with named slot if passed component in slot object', () => {
-    const wrapper = mount(ComponentWithSlots, {
+    const wrapper = mountingMethod(ComponentWithSlots, {
       slots: {
         header: Component
       }
@@ -134,7 +146,7 @@ describe('mount.slots', () => {
       functional: true,
       render: (h, ctx) => h('div', ctx.data, ctx.slots().default)
     }
-    const wrapper = mount(TestComponent, { slots: { default: Component }})
+    const wrapper = mountingMethod(TestComponent, { slots: { default: Component }})
     expect(wrapper.contains(Component)).to.equal(true)
   })
 
@@ -144,7 +156,7 @@ describe('mount.slots', () => {
       functional: true,
       render: (h, ctx) => h('div', ctx.data, ctx.slots().default)
     }
-    const wrapper = mount(TestComponent, { slots: { default: [Component] }})
+    const wrapper = mountingMethod(TestComponent, { slots: { default: [Component] }})
     expect(wrapper.contains(Component)).to.equal(true)
   })
 
@@ -155,7 +167,7 @@ describe('mount.slots', () => {
       render: (h, ctx) => h('div', ctx.data, ctx.slots().default)
     }
     const compiled = compileToFunctions('<div id="div" />')
-    const wrapper = mount(TestComponent, { slots: { default: [compiled] }})
+    const wrapper = mountingMethod(TestComponent, { slots: { default: [compiled] }})
     expect(wrapper.contains('#div')).to.equal(true)
   })
 
@@ -165,7 +177,7 @@ describe('mount.slots', () => {
       functional: true,
       render: (h, ctx) => h('div', ctx.data, ctx.slots().default)
     }
-    const wrapper = mount(TestComponent, { slots: { default: '<span />' }})
+    const wrapper = mountingMethod(TestComponent, { slots: { default: '<span />' }})
     expect(wrapper.contains('span')).to.equal(true)
   })
 
@@ -174,7 +186,7 @@ describe('mount.slots', () => {
       functional: true,
       render: (h, ctx) => h('div', {}, ctx.slots().named)
     }
-    const wrapper = mount(TestComponent, { slots: { named: Component }})
+    const wrapper = mountingMethod(TestComponent, { slots: { named: Component }})
     expect(wrapper.contains(Component)).to.equal(true)
   })
 
@@ -183,7 +195,7 @@ describe('mount.slots', () => {
       functional: true,
       render: (h, ctx) => h('div', {}, ctx.slots().named)
     }
-    const wrapper = mount(TestComponent, { slots: { named: [Component] }})
+    const wrapper = mountingMethod(TestComponent, { slots: { named: [Component] }})
     expect(wrapper.contains(Component)).to.equal(true)
   })
 
@@ -192,7 +204,7 @@ describe('mount.slots', () => {
       functional: true,
       render: (h, ctx) => h('div', {}, ctx.slots().named)
     }
-    const wrapper = mount(TestComponent, { slots: { named: '<span />' }})
+    const wrapper = mountingMethod(TestComponent, { slots: { named: '<span />' }})
     expect(wrapper.contains('span')).to.equal(true)
   })
 
@@ -201,7 +213,7 @@ describe('mount.slots', () => {
       functional: true,
       render: (h, ctx) => h('div', {}, ctx.slots().named)
     }
-    const wrapper = mount(TestComponent, { slots: { named: ['<span />'] }})
+    const wrapper = mountingMethod(TestComponent, { slots: { named: ['<span />'] }})
     expect(wrapper.contains('span')).to.equal(true)
   })
 
@@ -211,7 +223,7 @@ describe('mount.slots', () => {
       functional: true,
       render: (h, ctx) => h('div', ctx.data, ctx.slots().default)
     }
-    const fn = () => mount(TestComponent, { slots: { named: [false] }})
+    const fn = () => mountingMethod(TestComponent, { slots: { named: [false] }})
     const message = '[vue-test-utils]: slots[key] must be a Component, string or an array of Components'
     expect(fn).to.throw().with.property('message', message)
   })
@@ -222,7 +234,7 @@ describe('mount.slots', () => {
       functional: true,
       render: (h, ctx) => h('div', ctx.data, ctx.slots().default)
     }
-    const fn = () => mount(TestComponent, { slots: { named: [1] }})
+    const fn = () => mountingMethod(TestComponent, { slots: { named: [1] }})
     const message = '[vue-test-utils]: slots[key] must be a Component, string or an array of Components'
     expect(fn).to.throw().with.property('message', message)
   })
@@ -232,7 +244,7 @@ describe('mount.slots', () => {
       functional: true,
       render: (h, ctx) => h('div', ctx.data, ctx.slots().default)
     }
-    const fn = () => mount(TestComponent, { slots: { named: false }})
+    const fn = () => mountingMethod(TestComponent, { slots: { named: false }})
     const message = '[vue-test-utils]: slots[key] must be a Component, string or an array of Components'
     expect(fn).to.throw().with.property('message', message)
   })
@@ -243,7 +255,7 @@ describe('mount.slots', () => {
       functional: true,
       render: (h, ctx) => h('div', ctx.data, ctx.slots().default)
     }
-    const fn = () => mount(TestComponent, { slots: { named: 1 }})
+    const fn = () => mountingMethod(TestComponent, { slots: { named: 1 }})
     const message = '[vue-test-utils]: slots[key] must be a Component, string or an array of Components'
     expect(fn).to.throw().with.property('message', message)
   })
@@ -255,10 +267,10 @@ describe('mount.slots', () => {
     }
     const compilerSave = require.cache[require.resolve('vue-template-compiler')].exports.compileToFunctions
     require.cache[require.resolve('vue-template-compiler')].exports.compileToFunctions = undefined
-    delete require.cache[require.resolve('../../../src/mount')]
-    const mountFresh = require('../../../src/mount').default
+    delete require.cache[require.resolve('../../../dist/vue-test-utils')]
+    const mountingMethodFresh = require('../../../dist/vue-test-utils')[mountingMethod.name]
     const message = '[vue-test-utils]: vueTemplateCompiler is undefined, you must pass components explicitly if vue-template-compiler is undefined'
-    const fn = () => mountFresh(TestComponent, { slots: { default: ['<span />'] }})
+    const fn = () => mountingMethodFresh(TestComponent, { slots: { default: ['<span />'] }})
     try {
       expect(fn).to.throw().with.property('message', message)
     } catch (err) {
diff --git a/test/specs/mounting-options/stubs.spec.js b/test/specs/mounting-options/stubs.spec.js
index bc02e1124..26dea2c6a 100644
--- a/test/specs/mounting-options/stubs.spec.js
+++ b/test/specs/mounting-options/stubs.spec.js
@@ -1,12 +1,16 @@
-import { mount, config } from '~vue-test-utils'
+import { config } from '~vue-test-utils'
 import ComponentWithChild from '~resources/components/component-with-child.vue'
 import ComponentWithNestedChildren from '~resources/components/component-with-nested-children.vue'
 import Component from '~resources/components/component.vue'
 import ComponentAsAClass from '~resources/components/component-as-a-class.vue'
 import { createLocalVue } from '~vue-test-utils'
 import Vue from 'vue'
+import {
+  describeWithShallowAndMount,
+  itDoNotRunIf
+ } from '~resources/test-utils'
 
-describe('mount.stub', () => {
+describeWithShallowAndMount('options.stub', (mountingMethod) => {
   let info
   let warn
   let configStubsSave
@@ -28,7 +32,7 @@ describe('mount.stub', () => {
     const ComponentWithRender = { render: h => h('div') }
     const ComponentWithoutRender = { template: '<div></div>' }
     const ExtendedComponent = Vue.extend({ template: '<div></div>' })
-    mount(ComponentWithChild, {
+    mountingMethod(ComponentWithChild, {
       stubs: {
         ChildComponent: ComponentAsAClass,
         ChildComponent2: ComponentWithRender,
@@ -39,7 +43,7 @@ describe('mount.stub', () => {
   })
 
   it('replaces component with template string ', () => {
-    const wrapper = mount(ComponentWithChild, {
+    const wrapper = mountingMethod(ComponentWithChild, {
       stubs: {
         ChildComponent: '<div class="stub"></div>'
       }
@@ -49,7 +53,7 @@ describe('mount.stub', () => {
   })
 
   it('replaces component with a component', () => {
-    const wrapper = mount(ComponentWithChild, {
+    const wrapper = mountingMethod(ComponentWithChild, {
       stubs: {
         ChildComponent: {
           render: h => h('div'),
@@ -64,21 +68,22 @@ describe('mount.stub', () => {
   })
 
   it('does not error if component to stub contains no components', () => {
-    mount(Component, {
+    mountingMethod(Component, {
       stubs: {
         doesNotExist: Component
       }
     })
   })
 
-  it('does not modify component directly', () => {
-    const wrapper = mount(ComponentWithNestedChildren, {
+  itDoNotRunIf(mountingMethod.name === 'shallow',
+  'does not modify component directly', () => {
+    const wrapper = mountingMethod(ComponentWithNestedChildren, {
       stubs: {
         ChildComponent: '<div />'
       }
     })
     expect(wrapper.findAll(Component).length).to.equal(0)
-    const mountedWrapper = mount(ComponentWithNestedChildren)
+    const mountedWrapper = mountingMethod(ComponentWithNestedChildren)
     expect(mountedWrapper.findAll(Component).length).to.equal(1)
   })
 
@@ -86,7 +91,7 @@ describe('mount.stub', () => {
     const ComponentWithGlobalComponent = {
       render: h => h('registered-component')
     }
-    const wrapper = mount(ComponentWithGlobalComponent, {
+    const wrapper = mountingMethod(ComponentWithGlobalComponent, {
       stubs: {
         'registered-component': Component
       }
@@ -98,7 +103,7 @@ describe('mount.stub', () => {
     const ComponentWithGlobalComponent = {
       render: h => h('registered-component')
     }
-    mount(ComponentWithGlobalComponent, {
+    mountingMethod(ComponentWithGlobalComponent, {
       stubs: ['registered-component']
     })
 
@@ -109,7 +114,7 @@ describe('mount.stub', () => {
     const ComponentWithGlobalComponent = {
       render: h => h('registered-component')
     }
-    mount(ComponentWithGlobalComponent, {
+    mountingMethod(ComponentWithGlobalComponent, {
       stubs: {
         'registered-component': true
       }
@@ -124,7 +129,7 @@ describe('mount.stub', () => {
     const invalidValues = [{}, [], 3]
     const error = '[vue-test-utils]: each item in an options.stubs array must be a string'
     invalidValues.forEach(invalidValue => {
-      const fn = () => mount(ComponentWithGlobalComponent, {
+      const fn = () => mountingMethod(ComponentWithGlobalComponent, {
         stubs: [invalidValue]
       })
       expect(fn).to.throw().with.property('message', error)
@@ -151,13 +156,14 @@ describe('mount.stub', () => {
     require.cache[require.resolve('vue-template-compiler')].exports.compileToFunctions = compilerSave
   })
 
-  it('does not stub component when set to false', () => {
-    const wrapper = mount(ComponentWithChild, {
-      stubs: {
-        ChildComponent: false
-      }})
-    expect(wrapper.find('span').contains('div')).to.equal(true)
-  })
+  itDoNotRunIf(mountingMethod.name === 'shallow',
+    'does not stub component when set to false', () => {
+      const wrapper = mountingMethod(ComponentWithChild, {
+        stubs: {
+          ChildComponent: false
+        }})
+      expect(wrapper.find('span').contains('div')).to.equal(true)
+    })
 
   it('combines with stubs from config', () => {
     const localVue = createLocalVue()
@@ -177,7 +183,7 @@ describe('mount.stub', () => {
       ])
     }
 
-    const wrapper = mount(TestComponent, {
+    const wrapper = mountingMethod(TestComponent, {
       stubs: {
         'span-component': '<p />'
       },
@@ -199,7 +205,7 @@ describe('mount.stub', () => {
       ])
     }
 
-    const wrapper = mount(TestComponent, {
+    const wrapper = mountingMethod(TestComponent, {
       stubs: {
         'time-component': '<span />'
       },
@@ -221,7 +227,7 @@ describe('mount.stub', () => {
       ])
     }
 
-    const wrapper = mount(TestComponent, {
+    const wrapper = mountingMethod(TestComponent, {
       stubs: ['a-component'],
       localVue
     })
@@ -245,7 +251,7 @@ describe('mount.stub', () => {
       template: '<div>No render function</div>'
     }
 
-    const wrapper = mount(TestComponent, {
+    const wrapper = mountingMethod(TestComponent, {
       stubs: {
         'stub-component': StubComponent
       }
@@ -258,7 +264,7 @@ describe('mount.stub', () => {
     const error = '[vue-test-utils]: options.stub values must be passed a string or component'
     const invalidValues = [1, null, [], {}, NaN]
     invalidValues.forEach(invalidValue => {
-      const fn = () => mount(ComponentWithChild, {
+      const fn = () => mountingMethod(ComponentWithChild, {
         stubs: {
           ChildComponent: invalidValue
         }})
diff --git a/test/specs/wrapper/contains.spec.js b/test/specs/wrapper/contains.spec.js
index 31d345aca..09aa8fc0a 100644
--- a/test/specs/wrapper/contains.spec.js
+++ b/test/specs/wrapper/contains.spec.js
@@ -5,8 +5,7 @@ import FunctionalComponent from '~resources/components/functional-component.vue'
 import ComponentAsAClass from '~resources/components/component-as-a-class.vue'
 import {
   functionalSFCsSupported,
-  describeWithShallowAndMount,
-  itSkipIf
+  describeWithShallowAndMount
 } from '~resources/test-utils'
 import ComponentWithoutName from '~resources/components/component-without-name.vue'
 
@@ -41,8 +40,7 @@ describeWithShallowAndMount('contains', (mountingMethod) => {
     expect(wrapper.contains(FunctionalComponent)).to.equal(true)
   })
 
-  itSkipIf(mountingMethod.name === 'shallow',
-  'returns true if wrapper contains Vue class component', () => {
+  it('returns true if wrapper contains Vue class component', () => {
     const TestComponent = {
       template: `
         <div>
diff --git a/test/specs/wrapper/find.spec.js b/test/specs/wrapper/find.spec.js
index 95eddff93..53bb7c1e9 100644
--- a/test/specs/wrapper/find.spec.js
+++ b/test/specs/wrapper/find.spec.js
@@ -10,8 +10,7 @@ import ComponentAsAClass from '~resources/components/component-as-a-class.vue'
 import {
   functionalSFCsSupported,
   vueVersion,
-  describeWithShallowAndMount,
-  itSkipIf
+  describeWithShallowAndMount
 } from '~resources/test-utils'
 
 describeWithShallowAndMount('find', (mountingMethod) => {
@@ -109,22 +108,21 @@ describeWithShallowAndMount('find', (mountingMethod) => {
     expect(wrapper.find(Component).vnode).to.be.an('object')
   })
 
-  itSkipIf(mountingMethod.name === 'shallow',
-    'returns Wrapper of class component', () => {
-      const TestComponent = {
-        template: `
+  it('returns Wrapper of class component', () => {
+    const TestComponent = {
+      template: `
         <div>
           <component-as-a-class />
         </div>
       `,
-        components: {
-          ComponentAsAClass
-        }
+      components: {
+        ComponentAsAClass
       }
+    }
 
-      const wrapper = mountingMethod(TestComponent)
-      expect(wrapper.find(ComponentAsAClass).vnode).to.be.an('object')
-    })
+    const wrapper = mountingMethod(TestComponent)
+    expect(wrapper.find(ComponentAsAClass).vnode).to.be.an('object')
+  })
 
   it('returns Wrapper of Vue Component matching functional component', () => {
     if (!functionalSFCsSupported()) {
diff --git a/test/specs/wrapper/findAll.spec.js b/test/specs/wrapper/findAll.spec.js
index 78928f6cc..db74f064b 100644
--- a/test/specs/wrapper/findAll.spec.js
+++ b/test/specs/wrapper/findAll.spec.js
@@ -8,8 +8,7 @@ import FunctionalComponent from '~resources/components/functional-component.vue'
 import ComponentAsAClass from '~resources/components/component-as-a-class.vue'
 import {
   functionalSFCsSupported,
-  describeWithShallowAndMount,
-  itSkipIf
+  describeWithShallowAndMount
 } from '~resources/test-utils'
 
 describeWithShallowAndMount('findAll', (mountingMethod) => {
@@ -195,22 +194,21 @@ describeWithShallowAndMount('findAll', (mountingMethod) => {
     expect(wrapper.findAll(ComponentWithoutName).length).to.equal(3)
   })
 
-  itSkipIf(mountingMethod.name === 'shallow',
-   'returns Wrapper of class component', () => {
-     const TestComponent = {
-       template: `
+  it('returns Wrapper of class component', () => {
+    const TestComponent = {
+      template: `
         <div>
           <component-as-a-class />
         </div>
       `,
-       components: {
-         ComponentAsAClass
-       }
-     }
-
-     const wrapper = mountingMethod(TestComponent)
-     expect(wrapper.findAll(ComponentAsAClass).length).to.equal(1)
-   })
+      components: {
+        ComponentAsAClass
+      }
+    }
+
+    const wrapper = mountingMethod(TestComponent)
+    expect(wrapper.findAll(ComponentAsAClass).length).to.equal(1)
+  })
 
   it('returns Wrapper of Vue Component matching functional component', () => {
     if (!functionalSFCsSupported()) {