--- old/modules/controls/src/test/java/javafx/scene/chart/XYChartTest.java	2015-09-03 15:01:36.855534400 -0700
+++ new/modules/controls/src/test/java/javafx/scene/chart/XYChartTest.java	2015-09-03 15:01:36.256500100 -0700
@@ -32,7 +32,7 @@
 import javafx.css.ParsedValue;
 import javafx.css.CssMetaData;
 import javafx.css.StyleableProperty;
-import com.sun.javafx.css.parser.CSSParser;
+import javafx.css.CssParser;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.layout.StackPane;
@@ -79,7 +79,7 @@
         assertEquals(10, new Double(yaxis.measure.getFont().getSize()).intValue());
         
         // set tick label font via css and test if ticklabelfont, measure and tick textnode follow.
-        ParsedValue pv = CSSParser.getInstance().parseExpr("-fx-tick-label-font","0.916667em System");
+        ParsedValue pv = new CssParser().parseExpr("-fx-tick-label-font","0.916667em System");
         Object val = pv.convert(null);        
         CssMetaData prop = ((StyleableProperty)yaxis.tickLabelFontProperty()).getCssMetaData();
         try {