diff --git a/js/tests/unit/popover.js b/js/tests/unit/popover.js
index 16f94e1438..5cb4cafddc 100644
--- a/js/tests/unit/popover.js
+++ b/js/tests/unit/popover.js
@@ -4,8 +4,7 @@ $(function () {
   module('popover plugin')
 
   test('should be defined on jquery object', function () {
-    var div = $('<div></div>')
-    ok(div.popover, 'popover method is defined')
+    ok($(document.body).popover, 'popover method is defined')
   })
 
   module('popover', {
@@ -20,46 +19,44 @@ $(function () {
   })
 
   test('should provide no conflict', function () {
-    ok(!$.fn.popover, 'popover was set back to undefined (org value)')
+    strictEqual($.fn.popover, undefined, 'popover was set back to undefined (org value)')
   })
 
-  test('should return element', function () {
-    var div = $('<div></div>')
-    ok(div.bootstrapPopover() == div, 'document.body returned')
+  test('should return jquery collection containing the element', function () {
+    var $el = $('<div/>')
+    var $popover = $el.bootstrapPopover()
+    ok($popover instanceof $, 'returns jquery collection')
+    strictEqual($popover[0], $el[0], 'collection contains element')
   })
 
   test('should render popover element', function () {
-    $.support.transition = false
-    var popover = $('<a href="#" title="mdo" data-content="http://twitter.com/mdo">@mdo</a>')
+    var $popover = $('<a href="#" title="mdo" data-content="http://twitter.com/mdo">@mdo</a>')
       .appendTo('#qunit-fixture')
       .bootstrapPopover('show')
 
-    ok($('.popover').length, 'popover was inserted')
-    popover.bootstrapPopover('hide')
-    ok(!$('.popover').length, 'popover removed')
+    notEqual($('.popover').length, 0, 'popover was inserted')
+    $popover.bootstrapPopover('hide')
+    equal($('.popover').length, 0, 'popover removed')
   })
 
   test('should store popover instance in popover data object', function () {
-    $.support.transition = false
-    var popover = $('<a href="#" title="mdo" data-content="http://twitter.com/mdo">@mdo</a>')
-      .bootstrapPopover()
+    var $popover = $('<a href="#" title="mdo" data-content="http://twitter.com/mdo">@mdo</a>').bootstrapPopover()
 
-    ok(!!popover.data('bs.popover'), 'popover instance exists')
+    ok($popover.data('bs.popover'), 'popover instance exists')
   })
 
   test('should store popover trigger in popover instance data object', function () {
-    $.support.transition = false
-    var popover = $('<a href="#" title="ResentedHook">@ResentedHook</a>')
+    var $popover = $('<a href="#" title="ResentedHook">@ResentedHook</a>')
       .appendTo('#qunit-fixture')
       .bootstrapPopover()
-    popover.bootstrapPopover('show')
-    ok(!!$('.popover').data('bs.popover'), 'popover trigger stored in instance data')
-    $('#qunit-fixture').empty()
+
+    $popover.bootstrapPopover('show')
+
+    ok($('.popover').data('bs.popover'), 'popover trigger stored in instance data')
   })
 
   test('should get title and content from options', function () {
-    $.support.transition = false
-    var popover = $('<a href="#">@fat</a>')
+    var $popover = $('<a href="#">@fat</a>')
       .appendTo('#qunit-fixture')
       .bootstrapPopover({
         title: function () {
@@ -70,23 +67,20 @@ $(function () {
         }
       })
 
-    popover.bootstrapPopover('show')
+    $popover.bootstrapPopover('show')
 
-    ok($('.popover').length, 'popover was inserted')
+    notEqual($('.popover').length, 0, 'popover was inserted')
     equal($('.popover .popover-title').text(), '@fat', 'title correctly inserted')
     equal($('.popover .popover-content').text(), 'loves writing tests （╯°□°）╯︵ ┻━┻', 'content correctly inserted')
 
-    popover.bootstrapPopover('hide')
-    ok(!$('.popover').length, 'popover was removed')
-    $('#qunit-fixture').empty()
+    $popover.bootstrapPopover('hide')
+    equal($('.popover').length, 0, 'popover was removed')
   })
 
   test('should not duplicate HTML object', function () {
-    $.support.transition = false
+    var $div = $('<div/>').html('loves writing tests （╯°□°）╯︵ ┻━┻')
 
-    var $div = $('<div>').html('loves writing tests （╯°□°）╯︵ ┻━┻')
-
-    var popover = $('<a href="#">@fat</a>')
+    var $popover = $('<a href="#">@fat</a>')
       .appendTo('#qunit-fixture')
       .bootstrapPopover({
         content: function () {
@@ -94,42 +88,38 @@ $(function () {
         }
       })
 
-    popover.bootstrapPopover('show')
-    ok($('.popover').length, 'popover was inserted')
+    $popover.bootstrapPopover('show')
+    notEqual($('.popover').length, 0, 'popover was inserted')
     equal($('.popover .popover-content').html(), $div, 'content correctly inserted')
 
-    popover.bootstrapPopover('hide')
-    ok(!$('.popover').length, 'popover was removed')
+    $popover.bootstrapPopover('hide')
+    equal($('.popover').length, 0, 'popover was removed')
 
-    popover.bootstrapPopover('show')
-    ok($('.popover').length, 'popover was inserted')
+    $popover.bootstrapPopover('show')
+    notEqual($('.popover').length, 0, 'popover was inserted')
     equal($('.popover .popover-content').html(), $div, 'content correctly inserted')
 
-    popover.bootstrapPopover('hide')
-    ok(!$('.popover').length, 'popover was removed')
-    $('#qunit-fixture').empty()
+    $popover.bootstrapPopover('hide')
+    equal($('.popover').length, 0, 'popover was removed')
   })
 
   test('should get title and content from attributes', function () {
-    $.support.transition = false
-    var popover = $('<a href="#" title="@mdo" data-content="loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻" >@mdo</a>')
+    var $popover = $('<a href="#" title="@mdo" data-content="loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻" >@mdo</a>')
       .appendTo('#qunit-fixture')
       .bootstrapPopover()
       .bootstrapPopover('show')
 
-    ok($('.popover').length, 'popover was inserted')
+    notEqual($('.popover').length, 0, 'popover was inserted')
     equal($('.popover .popover-title').text(), '@mdo', 'title correctly inserted')
     equal($('.popover .popover-content').text(), 'loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻', 'content correctly inserted')
 
-    popover.bootstrapPopover('hide')
-    ok(!$('.popover').length, 'popover was removed')
-    $('#qunit-fixture').empty()
+    $popover.bootstrapPopover('hide')
+    equal($('.popover').length, 0, 'popover was removed')
   })
 
 
-  test('should get title and content from attributes #2', function () {
-    $.support.transition = false
-    var popover = $('<a href="#" title="@mdo" data-content="loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻" >@mdo</a>')
+  test('should get title and content from attributes ignoring options passed via js', function () {
+    var $popover = $('<a href="#" title="@mdo" data-content="loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻" >@mdo</a>')
       .appendTo('#qunit-fixture')
       .bootstrapPopover({
         title: 'ignored title option',
@@ -137,48 +127,50 @@ $(function () {
       })
       .bootstrapPopover('show')
 
-    ok($('.popover').length, 'popover was inserted')
+    notEqual($('.popover').length, 0, 'popover was inserted')
     equal($('.popover .popover-title').text(), '@mdo', 'title correctly inserted')
     equal($('.popover .popover-content').text(), 'loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻', 'content correctly inserted')
 
-    popover.bootstrapPopover('hide')
-    ok(!$('.popover').length, 'popover was removed')
-    $('#qunit-fixture').empty()
+    $popover.bootstrapPopover('hide')
+    equal($('.popover').length, 0, 'popover was removed')
   })
 
-  test('should respect custom classes', function () {
-    $.support.transition = false
-    var popover = $('<a href="#">@fat</a>')
+  test('should respect custom template', function () {
+    var $popover = $('<a href="#">@fat</a>')
       .appendTo('#qunit-fixture')
       .bootstrapPopover({
         title: 'Test',
         content: 'Test',
-        template: '<div class="popover foobar"><div class="arrow"></div><div class="inner"><h3 class="title"></h3><div class="content"><p></p></div></div></div>'
+        template: '<div class="popover foobar"><div class="arrow"></div><div class="inner"><h3 class="title"/><div class="content"><p/></div></div></div>'
       })
 
-    popover.bootstrapPopover('show')
+    $popover.bootstrapPopover('show')
 
-    ok($('.popover').length, 'popover was inserted')
+    notEqual($('.popover').length, 0, 'popover was inserted')
     ok($('.popover').hasClass('foobar'), 'custom class is present')
 
-    popover.bootstrapPopover('hide')
-    ok(!$('.popover').length, 'popover was removed')
-    $('#qunit-fixture').empty()
+    $popover.bootstrapPopover('hide')
+    equal($('.popover').length, 0, 'popover was removed')
   })
 
   test('should destroy popover', function () {
-    var popover = $('<div/>').bootstrapPopover({
-      trigger: 'hover'
-    }).on('click.foo', function () {})
-    ok(popover.data('bs.popover'), 'popover has data')
-    ok($._data(popover[0], 'events').mouseover && $._data(popover[0], 'events').mouseout, 'popover has hover event')
-    ok($._data(popover[0], 'events').click[0].namespace == 'foo', 'popover has extra click.foo event')
-    popover.bootstrapPopover('show')
-    popover.bootstrapPopover('destroy')
-    ok(!popover.hasClass('in'), 'popover is hidden')
-    ok(!popover.data('popover'), 'popover does not have data')
-    ok($._data(popover[0], 'events').click[0].namespace == 'foo', 'popover still has click.foo')
-    ok(!$._data(popover[0], 'events').mouseover && !$._data(popover[0], 'events').mouseout, 'popover does not have any events')
+    var $popover = $('<div/>')
+      .bootstrapPopover({
+        trigger: 'hover'
+      })
+      .on('click.foo', $.noop)
+
+    ok($popover.data('bs.popover'), 'popover has data')
+    ok($._data($popover[0], 'events').mouseover && $._data($popover[0], 'events').mouseout, 'popover has hover event')
+    equal($._data($popover[0], 'events').click[0].namespace, 'foo', 'popover has extra click.foo event')
+
+    $popover.bootstrapPopover('show')
+    $popover.bootstrapPopover('destroy')
+
+    ok(!$popover.hasClass('in'), 'popover is hidden')
+    ok(!$popover.data('popover'), 'popover does not have data')
+    equal($._data($popover[0], 'events').click[0].namespace, 'foo', 'popover still has click.foo')
+    ok(!$._data($popover[0], 'events').mouseover && !$._data($popover[0], 'events').mouseout, 'popover does not have any events')
   })
 
 })