diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaPairMatcherTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaPairMatcherTest.java
index 8009611..0abe64c 100644
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaPairMatcherTest.java
+++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/JavaPairMatcherTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -34,7 +34,7 @@
  */
 public class JavaPairMatcherTest extends AbstractPairMatcherTest {
 
-	private static boolean BEFORE_MATCHES_DISABLED= true;
+	private static final boolean fgCaretInsideMatchedPair= true;
 
 	protected IDocument fDocument;
 	protected JavaPairMatcher fPairMatcher;
@@ -50,6 +50,11 @@
 
 	protected ICharacterPairMatcher createMatcher(String chars) {
 		return new JavaPairMatcher(chars.toCharArray());
+	}
+
+	@Override
+	protected void performMatch(ICharacterPairMatcher matcher, String testCase) {
+		super.performMatch(matcher, testCase, fgCaretInsideMatchedPair);
 	}
 
 	protected void setUp() {
@@ -81,20 +86,10 @@
 
 	public void testBeforeOpeningMatch() {
 		IRegion match= fPairMatcher.match(fDocument, 2);
-		if (BEFORE_MATCHES_DISABLED) {
-			assertNull(match);
-		} else {
-			assertNotNull(match);
-			assertTrue(match.getOffset() == 2 && match.getLength() == 10);
-		}
+		assertNull(match);
 
 		match= fPairMatcher.match(fDocument, 5);
-		if (BEFORE_MATCHES_DISABLED) {
-			assertNull(match);
-		} else {
-			assertNotNull(match);
-			assertTrue(match.getOffset() == 5 && match.getLength() == 4);
-		}
+		assertNull(match);
 	}
 
 	public void testAfterOpeningMatch() {
@@ -109,66 +104,47 @@
 
 	public void testBeforeClosingMatch() {
 		IRegion match= fPairMatcher.match(fDocument, 11);
-		if (BEFORE_MATCHES_DISABLED) {
-			assertNull(match);
-		} else {
-			assertNotNull(match);
-			assertTrue(match.getOffset() == 2 && match.getLength() == 10);
-		}
+		assertNotNull(match);
+		assertTrue(match.getOffset() == 2 && match.getLength() == 10);
 
 		match= fPairMatcher.match(fDocument, 8);
-		if (BEFORE_MATCHES_DISABLED) {
-			assertNull(match);
-		} else {
-			assertNotNull(match);
-			assertTrue(match.getOffset() == 5 && match.getLength() == 4);
-		}
+		assertNotNull(match);
+		assertTrue(match.getOffset() == 5 && match.getLength() == 4);
+
 	}
 
 	public void testAfterClosingMatch() {
 		IRegion match= fPairMatcher.match(fDocument, 12);
-		assertNotNull(match);
-		assertTrue(match.getOffset() == 2 && match.getLength() == 10);
+		assertNull(match);
 
 		match= fPairMatcher.match(fDocument, 9);
-		assertNotNull(match);
-		assertTrue(match.getOffset() == 5 && match.getLength() == 4);
+		assertNull(match);
 	}
 
 	public void testBeforeClosingMatchWithNL() {
 		fDocument.set("x(y\ny)x");
 		IRegion match= fPairMatcher.match(fDocument, 5);
-		if (BEFORE_MATCHES_DISABLED) {
-			assertNull(match);
-		} else {
-			assertNotNull(match);
-			assertTrue(match.getOffset() == 1 && match.getLength() == 5);
-		}
+		assertNotNull(match);
+		assertTrue(match.getOffset() == 1 && match.getLength() == 5);
 	}
 
 	public void testAfterClosingMatchWithNL() {
 		fDocument.set("x(y\ny)x");
 		IRegion match= fPairMatcher.match(fDocument, 6);
-		assertNotNull(match);
-		assertTrue(match.getOffset() == 1 && match.getLength() == 5);
+		assertNull(match);
 	}
 
 	public void testBeforeClosingMatchWithNLAndSingleLineComment() {
 		fDocument.set("x\nx(y\nx //(x\ny)x");
 		IRegion match= fPairMatcher.match(fDocument, 14);
-		if (BEFORE_MATCHES_DISABLED) {
-			assertNull(match);
-		} else {
-			assertNotNull(match);
-			assertTrue(match.getOffset() == 3 && match.getLength() == 12);
-		}
+		assertNotNull(match);
+		assertTrue(match.getOffset() == 3 && match.getLength() == 12);
 	}
 
 	public void testAfterClosingMatchWithNLAndSingleLineComment() {
 		fDocument.set("x\nx(y\nx //(x\ny)x");
 		IRegion match= fPairMatcher.match(fDocument, 15);
-		assertNotNull(match);
-		assertTrue(match.getOffset() == 3 && match.getLength() == 12);
+		assertNull(match);
 	}
 
 	public void testAngleBrackets1_4() {
@@ -189,7 +165,7 @@
 	public void testAngleBrackets1_5() {
 		final JavaPairMatcher matcher= (JavaPairMatcher) createMatcher("(){}[]<>");
 		matcher.setSourceVersion(JavaCore.VERSION_1_5);
-		performMatch(matcher, " #<>% ");
+		performMatch(matcher, " #< %> ");
 		performMatch(matcher, " <%># ");
 		performMatch(matcher, " 2 < 3 || 4 >% 5 ");
 		performMatch(matcher, " 2 <% 3 || 4 > 5 ");
@@ -203,7 +179,7 @@
 
 	public void testBug209505() {
 		fDocument.set("(xny)/*  */");
-		IRegion match= fPairMatcher.match(fDocument, 5);
+		IRegion match= fPairMatcher.match(fDocument, 4);
 		assertNotNull(match);
 		assertTrue(match.getOffset() == 0 && match.getLength() == 5);
 	}