diff --git a/tests/drupalorgTest.php b/tests/drupalorgTest.php
index d561202..7c5e51e 100644
--- a/tests/drupalorgTest.php
+++ b/tests/drupalorgTest.php
@@ -29,7 +29,7 @@ class drupalorgDrushMakeTestCase extends Drush_CommandTestCase {
     );
     $makefile_path = dirname(__FILE__) . '/makefiles';
     $config = $this->getMakefile($test);
-    $options = array_merge($config['options'], $default_options);
+    $options = $config['options'] + $default_options;
     $makefile = $makefile_path . '/' . $config['makefile'];
     $return = !empty($config['fail']) ? self::EXIT_ERROR : self::EXIT_SUCCESS;
     $command = isset($config['command']) ? $config['command'] : 'make';
@@ -54,6 +54,18 @@ class drupalorgDrushMakeTestCase extends Drush_CommandTestCase {
     $this->runMakefileTest('do-make-fail-library');
   }
 
+  function testMakeDoFailCoreAndContribAsCore() {
+    $this->runMakefileTest('do-make-fail-core-and-contrib-as-core');
+  }
+
+  function testMakeDoFailCoreAndContribAsContrib() {
+    $this->runMakefileTest('do-make-fail-core-and-contrib-as-contrib');
+  }
+
+  function testMakeDoFailCoreAndLibrary() {
+    $this->runMakefileTest('do-make-fail-core-and-library');
+  }
+
   function testMakeSucceedLibrary() {
     $this->runMakefileTest('do-make-succeed-library');
   }
@@ -94,6 +106,18 @@ class drupalorgDrushMakeTestCase extends Drush_CommandTestCase {
     $this->runMakefileTest('do-verify-makefile-fail-library');
   }
 
+  function testVerifyMakefileDoFailCoreAndContribAsCore() {
+    $this->runMakefileTest('do-verify-makefile-fail-core-and-contrib-as-core');
+  }
+
+  function testVerifyMakefileDoFailCoreAndContribAsContrib() {
+    $this->runMakefileTest('do-verify-makefile-fail-core-and-contrib-as-contrib');
+  }
+
+  function testVerifyMakefileDoFailCoreAndLibrary() {
+    $this->runMakefileTest('do-verify-makefile-fail-core-and-library');
+  }
+
   function testVerifyMakefileSucceedLibrary() {
     $this->runMakefileTest('do-verify-makefile-succeed-library');
   }
@@ -153,6 +177,24 @@ class drupalorgDrushMakeTestCase extends Drush_CommandTestCase {
         'md5'    => 'e1f749d6aad0e2509fefc715f72a3ceb',
         'options' => array(),
       ),
+      'do-make-fail-core-and-contrib-as-contrib' => array(
+        'name'     => 'D.o: Fail core and contrib using contrib validation',
+        'makefile' => 'do-fail-core-and-contrib.make',
+        'fail'    => TRUE,
+        'options' => array('drupal-org' => 'contrib'),
+      ),
+      'do-make-fail-core-and-contrib-as-core' => array(
+        'name'     => 'D.o: Fail core and contrib using core validation',
+        'makefile' => 'do-fail-core-and-contrib.make',
+        'fail'    => TRUE,
+        'options' => array('drupal-org' => 'core'),
+      ),
+      'do-make-fail-core-and-library' => array(
+        'name'     => 'D.o: Fail core and library',
+        'makefile' => 'do-fail-core-and-library.make',
+        'fail'    => TRUE,
+        'options' => array('drupal-org' => 'core'),
+      ),
       'do-make-fail-patch' => array(
         'name'     => 'D.o: Fail patch',
         'makefile' => 'do-fail-patch.make',
@@ -215,6 +257,27 @@ class drupalorgDrushMakeTestCase extends Drush_CommandTestCase {
         'command' => 'verify-makefile',
         'options' => array(),
       ),
+      'do-verify-makefile-fail-core-and-contrib-as-contrib' => array(
+        'name'     => 'D.o: Fail core and contrib using contrib validation',
+        'makefile' => 'do-fail-core-and-contrib.make',
+        'fail'    => TRUE,
+        'command' => 'verify-makefile',
+        'options' => array('drupal-org' => 'contrib'),
+      ),
+      'do-verify-makefile-fail-core-and-contrib-as-core' => array(
+        'name'     => 'D.o: Fail core and contrib using core validation',
+        'makefile' => 'do-fail-core-and-contrib.make',
+        'fail'    => TRUE,
+        'command' => 'verify-makefile',
+        'options' => array('drupal-org' => 'core'),
+      ),
+      'do-verify-makefile-fail-core-and-library' => array(
+        'name'     => 'D.o: Fail core and library',
+        'makefile' => 'do-fail-core-and-library.make',
+        'fail'    => TRUE,
+        'command' => 'verify-makefile',
+        'options' => array('drupal-org' => 'core'),
+      ),
       'do-verify-makefile-fail-patch' => array(
         'name'     => 'D.o: Fail patch',
         'makefile' => 'do-fail-patch.make',
@@ -258,7 +321,7 @@ class drupalorgDrushMakeTestCase extends Drush_CommandTestCase {
         'name' => 'D.o: Verify with only core project',
         'makefile' => 'do-pass-verify-core-only.make',
         'command' => 'verify-makefile',
-        'options' => array(),
+        'options' => array('drupal-org' => 'core'),
       ),
 
     );
diff --git a/tests/makefiles/do-fail-core-and-contrib.make b/tests/makefiles/do-fail-core-and-contrib.make
new file mode 100644
index 0000000..af27ca9
--- /dev/null
+++ b/tests/makefiles/do-fail-core-and-contrib.make
@@ -0,0 +1,5 @@
+api = 2
+core = 7.x
+projects[drupal] = 7.12
+projects[update_test_module] = 2.2
+
diff --git a/tests/makefiles/do-fail-core-and-library.make b/tests/makefiles/do-fail-core-and-library.make
new file mode 100644
index 0000000..2e9bb6a
--- /dev/null
+++ b/tests/makefiles/do-fail-core-and-library.make
@@ -0,0 +1,5 @@
+api = 2
+core = 7.x
+projects[drupal] = 7.12
+libraries[jquery_ui][download][type] = "file"
+libraries[jquery_ui][download][url] = "http://jquery-ui.googlecode.com/files/jquery.ui-1.6.zip"
diff --git a/tests/makefiles/do-pass-verify-core-only.make b/tests/makefiles/do-pass-verify-core-only.make
index 8787c96..c8b359f 100644
--- a/tests/makefiles/do-pass-verify-core-only.make
+++ b/tests/makefiles/do-pass-verify-core-only.make
@@ -1,4 +1,3 @@
 api = 2
 core = 7.x
 projects[drupal] = 7.12
-projects[views] = 3.1