diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXTestCase.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXTestCase.java
index 7cefdb5b178f..272a950829d9 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXTestCase.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXTestCase.java
@@ -46,7 +46,7 @@ public abstract class AbstractJavaFXTestCase extends LightCodeInsightFixtureTest
   }
 
   public static void addJavaFxJarAsLibrary(@NotNull Module module, @Nullable ModifiableRootModel model) {
-    final String libPath = PluginPathManager.getPluginHomePath("javaFX") + "/testData"; //System.getProperty("java.home") + File.separator + "lib" + File.separator + "ext";
+    final String libPath = System.getProperty("java.home") + File.separator + "lib" + File.separator + "ext";
     if (model != null) {
       PsiTestUtil.addLibrary(module, model, "javafx", libPath, "jfxrt.jar");
     }
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxClassBackedElementDescriptor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxClassBackedElementDescriptor.java
index 6ebc4e2aebd0..812c9d650005 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxClassBackedElementDescriptor.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxClassBackedElementDescriptor.java
@@ -369,7 +369,7 @@ public class JavaFxClassBackedElementDescriptor implements XmlElementDescriptor,
     PsiClass aClass = myPsiClass;
     final XmlAttribute constAttr = context.getAttribute(FxmlConstants.FX_CONSTANT);
     if (constAttr != null && aClass != null) {
-      final PsiField constField = aClass.findFieldByName(constAttr.getValue(), false);
+      final PsiField constField = aClass.findFieldByName(constAttr.getValue(), true);
       if (constField != null) {
         aClass = PsiUtil.resolveClassInType(constField.getType());
       }
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxPropertyAttributeDescriptor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxPropertyAttributeDescriptor.java
index 9f52ae28df19..557bc3e130c1 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxPropertyAttributeDescriptor.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxPropertyAttributeDescriptor.java
@@ -110,8 +110,8 @@ public class JavaFxPropertyAttributeDescriptor extends BasicXmlAttributeDescript
   public PsiElement getEnumeratedValueDeclaration(XmlElement xmlElement, String value) {
     final PsiClass aClass = getEnum();
     if (aClass != null) {
-      final PsiField fieldByName = aClass.findFieldByName(value, false);
-      return fieldByName != null ? fieldByName : aClass.findFieldByName(value.toUpperCase(), false);
+      final PsiField fieldByName = aClass.findFieldByName(value, true);
+      return fieldByName != null ? fieldByName : aClass.findFieldByName(value.toUpperCase(), true);
     }
     return xmlElement;
   }
diff --git a/plugins/javaFX/testData/highlighting/readOnly.fxml b/plugins/javaFX/testData/highlighting/readOnly.fxml
index 431a6d12c66d..3e27198260ff 100644
--- a/plugins/javaFX/testData/highlighting/readOnly.fxml
+++ b/plugins/javaFX/testData/highlighting/readOnly.fxml
@@ -1,6 +1,6 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import java.lang.String?>
-<AnchorPane id="AnchorPane" xmlns:fx="http://javafx.com/fxml" stylesheets="<error descr="Cannot resolve file 'mystyle.css'">mystyle.css</error>" <error descr="Property 'backgroundFills' is read-only">backgroundFills=""</error>>
+<AnchorPane id="AnchorPane" xmlns:fx="http://javafx.com/fxml" stylesheets="<error descr="Cannot resolve file 'mystyle.css'">mystyle.css</error>" <error descr="Attribute backgroundFills is not allowed here">backgroundFills</error>="">
   <stylesheets>
     <String fx:value="<error descr="Cannot resolve file 'mystyle.css'">mystyle.css</error>"/>
   </stylesheets>
diff --git a/plugins/javaFX/testData/jfxrt.jar b/plugins/javaFX/testData/jfxrt.jar
deleted file mode 100644
index 48109d611026..000000000000
Binary files a/plugins/javaFX/testData/jfxrt.jar and /dev/null differ