diff --git a/plugins/maven/src/test/data/local1/junit/junit/maven-metadata.xml b/plugins/maven/src/test/data/local1/junit/junit/maven-metadata.xml
new file mode 100644
index 000000000000..66cf8d14bf2c
--- /dev/null
+++ b/plugins/maven/src/test/data/local1/junit/junit/maven-metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>junit</groupId>
+  <artifactId>junit</artifactId>
+  <versioning>
+    <versions>
+      <version>3.8.1</version>
+      <version>3.8.2</version>
+      <version>4.0</version>
+    </versions>
+  </versioning>
+</metadata>
diff --git a/plugins/maven/src/test/data/local1/junit/junit/maven-metadata.xml.sha1 b/plugins/maven/src/test/data/local1/junit/junit/maven-metadata.xml.sha1
new file mode 100644
index 000000000000..5b5b42670291
--- /dev/null
+++ b/plugins/maven/src/test/data/local1/junit/junit/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+a65f5d14c3dbdef19070e6c46efd674d4b2a2898
\ No newline at end of file
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDependencySmartCompletionTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDependencySmartCompletionTest.java
index a0fdee05eeb4..7d461e43dcdb 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDependencySmartCompletionTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDependencySmartCompletionTest.java
@@ -206,7 +206,7 @@ public class MavenDependencySmartCompletionTest extends MavenDomWithIndicesTestC
     myFixture.configureFromExistingVirtualFile(myProjectPom);
 
     LookupElement[] elements = myFixture.completeBasic();
-    assertSize(1, elements);
+    assertSize(2, elements);
 
     myFixture.type('\n');
 
@@ -245,7 +245,7 @@ public class MavenDependencySmartCompletionTest extends MavenDomWithIndicesTestC
     myFixture.configureFromExistingVirtualFile(myProjectPom);
 
     LookupElement[] elements = myFixture.completeBasic();
-    assertSize(1, elements);
+    assertSize(2, elements);
 
     myFixture.type('\n');
 
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java
index 0d824d9a1c51..c36a885fa329 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java
@@ -2191,7 +2191,7 @@ public class DependenciesImportingTest extends MavenImportingTestCase {
                   "<repositories>" +
                   "  <repository>" +
                   "    <id>central</id>" +
-                  "    <url>file://localhost/${basedir}/repo</url>" +
+                  "    <url>file://localhost/" + repoPath + "</url>" +
                   "  </repository>" +
                   "</repositories>");
 
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenSearcherTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenSearcherTest.java
index 4018e23ac023..57302eb7c521 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenSearcherTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenSearcherTest.java
@@ -90,6 +90,7 @@ public class MavenSearcherTest extends MavenIndicesTestCase {
   public void testArtifactSearch() throws Exception {
     assertArtifactSearchResults("",
                                 "asm:asm:3.3.1 asm:asm:3.3",
+                                "asm:asm-attrs:2.2.1",
                                 "commons-io:commons-io:2.4",
                                 "jmock:jmock:1.2.0 jmock:jmock:1.1.0 jmock:jmock:1.0.0",
                                 "junit:junit:4.0 junit:junit:3.8.2 junit:junit:3.8.1",