diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorTests.java
index 68a4db6e9d0..728d8fd8590 100644
--- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorTests.java
+++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/cdescriptor/tests/CDescriptorTests.java
@@ -1,5 +1,5 @@
 /**********************************************************************
- * Copyright (c) 2004, 2009 QNX Software Systems Ltd and others.
+ * Copyright (c) 2004, 2012 QNX Software Systems Ltd 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
@@ -47,12 +47,6 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 
-/**
- * @author David
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
 public class CDescriptorTests extends BaseTestCase {
 
 	static String projectId = CTestPlugin.PLUGIN_ID + ".TestProject";
@@ -176,8 +170,9 @@ public class CDescriptorTests extends BaseTestCase {
 		Assert.assertEquals("C/C++ Test Project", owner.getName());
 	}
 
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=185930
-	public void testConcurrentDescriptorCreation() throws Exception {
+	// Disabled this test because it fails every now and then and it tests deprecated API
+	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=340123
+	public void _testConcurrentDescriptorCreation() throws Exception {
 		for (int i = 0; i < 100 ; i++) {
 			fProject.close(null);
 			fProject.open(null);