diff --git a/Makefile b/Makefile
index 34a40fa9b63..619d13947ea 100644
--- a/Makefile
+++ b/Makefile
@@ -275,7 +275,7 @@ $(MAT$(PROJECT)_SO): $(MAT$(PROJECT)_SRC) $(STATIC_NAME)
 	@ echo
 
 runtest: $(TEST_ALL_BIN)
-	$(TEST_ALL_BIN) $(TEST_GPUID)
+	$(TEST_ALL_BIN) $(TEST_GPUID) --gtest_shuffle
 
 $(ALL_BUILD_DIRS):
 	@ mkdir -p $@
diff --git a/src/caffe/test/test_neuron_layer.cpp b/src/caffe/test/test_neuron_layer.cpp
index 9c852a1c697..5d74630673b 100644
--- a/src/caffe/test/test_neuron_layer.cpp
+++ b/src/caffe/test/test_neuron_layer.cpp
@@ -170,6 +170,7 @@ TYPED_TEST(NeuronLayerTest, TestDropoutCPU) {
 TYPED_TEST(NeuronLayerTest, TestDropoutGradientCPU) {
   LayerParameter layer_param;
   Caffe::set_mode(Caffe::CPU);
+  Caffe::set_phase(Caffe::TRAIN);
   DropoutLayer<TypeParam> layer(layer_param);
   GradientChecker<TypeParam> checker(1e-2, 1e-3);
   checker.CheckGradientEltwise(&layer, &(this->blob_bottom_vec_),
@@ -219,6 +220,7 @@ TYPED_TEST(NeuronLayerTest, TestDropoutGradientGPU) {
   if (CAFFE_TEST_CUDA_PROP.major >= 2) {
     LayerParameter layer_param;
     Caffe::set_mode(Caffe::GPU);
+    Caffe::set_phase(Caffe::TRAIN);
     DropoutLayer<TypeParam> layer(layer_param);
     GradientChecker<TypeParam> checker(1e-2, 1e-3);
     // it is too expensive to call curand multiple times, so we don't do an