diff --git a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
index 497e54c96c00..9976c24e2a30 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
@@ -78,6 +78,7 @@ public void setUp() throws Exception {
     assertU(commit());
   }
 
+  @Nightly
   public void testStats() throws Exception {
     for (String f : new String[] {
             "stats_i","stats_l","stats_f","stats_d",
@@ -1328,7 +1329,8 @@ public static void create(Stat stat, String input,
       ALL.put(stat, new ExpectedStat(stat, input, perShardXpaths, finalXpaths));
     }
   }
-  
+
+  @Nightly
   public void testIndividualStatLocalParams() throws Exception {
     final String kpre = ExpectedStat.KPRE;
     
diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetRefinement.java b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetRefinement.java
index 1d844e63e575..36530003669e 100644
--- a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetRefinement.java
+++ b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacetRefinement.java
@@ -1019,6 +1019,7 @@ public void testSortedSubFacetRefinementWhenParentOnlyReturnedByOneShardProcessE
 
   
   @Test
+  @Nightly
   public void testBasicRefinement() throws Exception {
     ModifiableSolrParams p;
     p = params("cat_s", "cat_s", "cat_i", "cat_i", "date","cat_dt", "xy_s", "xy_s", "num_d", "num_d", "qw_s", "qw_s", "er_s", "er_s");
diff --git a/solr/core/src/test/org/apache/solr/store/blockcache/BlockCacheTest.java b/solr/core/src/test/org/apache/solr/store/blockcache/BlockCacheTest.java
index e612a9ba85e3..2bf65aeaaaa8 100644
--- a/solr/core/src/test/org/apache/solr/store/blockcache/BlockCacheTest.java
+++ b/solr/core/src/test/org/apache/solr/store/blockcache/BlockCacheTest.java
@@ -43,7 +43,7 @@ public class BlockCacheTest extends SolrTestCase {
 
   @Test
   public void testBlockCache() {
-    int blocksInTest = 2000000;
+    int blocksInTest = TEST_NIGHTLY ? 2000000 : 20000;
     int blockSize = 1024;
 
     int slabSize = blockSize * 4096;
@@ -57,7 +57,7 @@ public void testBlockCache() {
     AtomicLong missesInCache = new AtomicLong();
     long storeTime = 0;
     long fetchTime = 0;
-    int passes = 10000;
+    int passes = TEST_NIGHTLY ?  10000 : 10;
 
     BlockCacheKey blockCacheKey = new BlockCacheKey();
 
@@ -112,7 +112,7 @@ private static byte getByte(long pos) {
   public void testBlockCacheConcurrent() throws Exception {
     Random rnd = random();
 
-    final int blocksInTest = 400;  // pick something bigger than 256, since that would lead to a slab size of 64 blocks and the bitset locks would consist of a single word.
+    final int blocksInTest = TEST_NIGHTLY ? 400 : 40;  // pick something bigger than 256, since that would lead to a slab size of 64 blocks and the bitset locks would consist of a single word.
     final int blockSize = 64;
     final int slabSize = blocksInTest * blockSize / 4;
     final long totalMemory = 2 * slabSize;  // 2 slabs of memory, so only half of what is needed for all blocks
@@ -124,7 +124,7 @@ public void testBlockCacheConcurrent() throws Exception {
      final long totalMemory = 2 * slabSize;  // 2 slabs of memory, so only half of what is needed for all blocks
      ***/
 
-    final int nThreads = 64;
+    final int nThreads = TEST_NIGHTLY ? Runtime.getRuntime().availableProcessors() : 5;
     final int nReads = 1000000;
     final int readsPerThread = nReads / nThreads;
     final int readLastBlockOdds = 10; // odds (1 in N) of the next block operation being on the same block as the previous operation... helps flush concurrency issues