diff --git a/src/test/java/teammates/test/cases/BaseComponentTestCase.java b/src/test/java/teammates/test/cases/BaseComponentTestCase.java
index 6e25b95588ad..bbf13dcaa55a 100644
--- a/src/test/java/teammates/test/cases/BaseComponentTestCase.java
+++ b/src/test/java/teammates/test/cases/BaseComponentTestCase.java
@@ -4,6 +4,7 @@
 
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
 
 import com.google.appengine.api.blobstore.BlobKey;
 
@@ -27,6 +28,7 @@
  * Base class for all component tests.
  * It runs a simulated Datastore ({@link GaeSimulation}) which can be accessed via {@link BackDoorLogic}.
  */
+@Test(singleThreaded = true) // GaeSimulation is not thread safe
 public class BaseComponentTestCase extends BaseTestCaseWithDatastoreAccess {
 
     protected static final GaeSimulation gaeSimulation = GaeSimulation.inst();