diff --git a/core/org.eclipse.cdt.ui.tests/.classpath b/core/org.eclipse.cdt.ui.tests/.classpath
index b9de75ffbfc..f58f7904ab8 100644
--- a/core/org.eclipse.cdt.ui.tests/.classpath
+++ b/core/org.eclipse.cdt.ui.tests/.classpath
@@ -6,6 +6,7 @@
     <classpathentry kind="src" path="model/"/>
     <classpathentry kind="src" path="build"/>
     <classpathentry kind="src" path="parser"/>
+    <classpathentry kind="src" path="failures"/>
     <classpathentry kind="src" path="/org.apache.xerces"/>
     <classpathentry kind="src" path="/org.eclipse.core.boot"/>
     <classpathentry kind="src" path="/org.eclipse.core.resources"/>
diff --git a/core/org.eclipse.cdt.ui.tests/failures/org/eclipse/cdt/core/parser/failedTests/ScannerFailedTest.java b/core/org.eclipse.cdt.ui.tests/failures/org/eclipse/cdt/core/parser/failedTests/ScannerFailedTest.java
new file mode 100644
index 00000000000..4fe1d4eb416
--- /dev/null
+++ b/core/org.eclipse.cdt.ui.tests/failures/org/eclipse/cdt/core/parser/failedTests/ScannerFailedTest.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2001 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v0.5 
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v05.html
+ * 
+ * Contributors:
+ *     IBM Corp. - Rational Software - initial implementation
+ ******************************************************************************/
+
+package org.eclipse.cdt.core.parser.failedTests;
+
+import junit.framework.AssertionFailedError;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.cdt.core.parser.tests.ScannerTestCase;
+import org.eclipse.cdt.internal.core.parser.Token;
+
+/**
+ * @author aniefer
+ *
+ * To change the template for this generated type comment go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+public class ScannerFailedTest extends ScannerTestCase {
+
+	public ScannerFailedTest(String name){
+		super(name);
+	}
+	
+	public static Test suite()
+	{
+		TestSuite suite = new TestSuite();
+		
+		suite.addTest( new ScannerFailedTest( "testBug36316" ) );
+	
+		return suite;
+	}
+	
+	public void testBug36316() throws Exception
+	{
+		try
+		{
+			initializeScanner( "#define A B->A\nA" );
+		
+			validateIdentifier("B");
+			validateDefinition("A", "B->A");
+			validateToken(Token.tARROW);
+			validateIdentifier("A");
+			validateEOF();
+			
+			fail( "This test was expected to fail." );
+		} catch( Throwable e )
+		{
+			if( !( e instanceof AssertionFailedError ) ){
+				fail( "Unexpected failure" ); 
+			} 
+		}
+	}
+}