3 files changed, 16 insertions, 11 deletions
diff --git a/install/ui/test/aci_tests.js b/install/ui/test/aci_tests.js
index d51f1ea6..604a48b3 100644
--- a/install/ui/test/aci_tests.js
+++ b/install/ui/test/aci_tests.js
@@ -134,7 +134,7 @@ test("Testing aci grouptarget.", function() {
     var selected = $(target_section.type_select+":selected");
 
     same(selected.val(), 'targetgroup' , 'group control selected');
-    ok ($('#targetgroup-entity-select option').length > 2,
+    ok ($('option', selected.group_select).length > 2,
         'group select populated');
 
 });
diff --git a/install/ui/test/details_tests.js b/install/ui/test/details_tests.js
index 1b19f4b3..28e2029d 100644
--- a/install/ui/test/details_tests.js
+++ b/install/ui/test/details_tests.js
@@ -98,14 +98,14 @@ test("Testing IPA.details_section.create().", function() {
             'Checking field '+field.name+'\'s label'
         );
 
-        var span = $('span[name='+field.name+']', dl);
+        var field_container = $('.details-field[name='+field.name+']', dl);
 
         ok(
-            span.length,
-            'Checking span tag for field '+field.name
+            field_container.length,
+            'Checking container tag for field '+field.name
         );
 
-        var dd = $('dd', span);
+        var dd = $('dd', field_container);
 
         ok(
             dd.length == 0,
@@ -316,9 +316,9 @@ test("Testing IPA.details_section_setup again()",function(){
         '3 dd'
     );
 
-    var span = $('span[name="cn"]', dd[0]);
+    var field_container = $('.details-field[name="cn"]', dd[0]);
     same(
-        span.length, 1,
-        '1 span'
+        field_container.length, 1,
+        '1 field container'
     );
 });
diff --git a/install/ui/test/widget_tests.js b/install/ui/test/widget_tests.js
index 1abac1ca..c3ae8bea 100644
--- a/install/ui/test/widget_tests.js
+++ b/install/ui/test/widget_tests.js
@@ -265,10 +265,15 @@ test("IPA.select_widget" ,function(){
 
 
 test("IPA.entity_select_widget" ,function(){
+
     var widget = IPA.entity_select_widget({
-        name: 'uid', entity:'user',field_name:'uid'});
+        name: 'uid',
+        other_entity: 'user',
+        other_field: 'uid'
+    });
+
     base_widget_test(widget,'user','test_value');
-    ok( $('#uid-entity-select option').length > 1,"options populatedfrom AJAX");
+    ok( $('option', widget.container).length > 1,"options populated from AJAX");
     mock_record = {'uid':'kfrog'};
     widget.load(mock_record);
     same(widget.values[0],'kfrog','select set from values');
@@ -278,7 +283,7 @@ test("IPA.entity_select_widget" ,function(){
 test("IPA.entity_link_widget" ,function(){
     var widget = IPA.entity_link_widget({
         name: 'gidnumber',
-        other_entity:'group',
+        other_entity:'group'
     });
     base_widget_test(widget,'user','test_value');