--- old/functional/ControlsTests/test/javafx/scene/control/test/tabpane/NewTabPaneTest.java	2016-12-09 13:28:07.134718863 +0300
+++ new/functional/ControlsTests/test/javafx/scene/control/test/tabpane/NewTabPaneTest.java	2016-12-09 13:28:07.078718361 +0300
@@ -36,7 +36,6 @@
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.control.Tab;
-import javafx.scene.control.TabBuilder;
 import static javafx.scene.control.test.tabpane.NewTabPaneApp.*;
 import javafx.scene.control.test.utils.ptables.AbstractPropertyController.SettingType;
 import javafx.util.StringConverter;
@@ -292,9 +291,9 @@
         addTab(vetoTabName, 0, true, true);
 
         addTab(nonVetoTabName, 1, true, false);
-
+        
         checkTabsCount(2);
-
+        
         switchToPropertiesTab(vetoTabName);
         checkCounterValue(TAB_CLOSE_REQUEST_EVENT, 0);
         switchToPropertiesTab(nonVetoTabName);
@@ -318,7 +317,7 @@
         switchToPropertiesTab(nonVetoTabName);
         checkCounterValue(TAB_CLOSE_REQUEST_EVENT, 1);
     }
-
+    
     /**
      * Checks that when the sorting is applied
      * to the underlying data collection
@@ -328,15 +327,17 @@
     @Test(timeout=30000)
     public void renderingAfterSortingTest() {
         final int ITEMS_COUNT = 3;
-
+        
         StringConverter<Tab> conv = new StringConverter<Tab>() {
             @Override public String toString(Tab t) { return t.getText(); }
-
+            
             @Override public Tab fromString(String s) {
-                return TabBuilder.create().text(s).content(new Label("CONTENT!")).build();
+                Tab t = new Tab(s);
+                t.setContent(new Label("CONTENT!"));
+                return t;
             }
         };
-
+        
         SortValidator<Tab, Label> validator = new SortValidator<Tab, Label>(ITEMS_COUNT, conv) {
 
             @Override
@@ -365,7 +366,7 @@
             protected String getTextFromCell(Label cell) {
                 return cell.getText();
             }
-
+            
             @Override
             protected void sort() {
                 new GetAction<Object>() {