diff --git a/tests/phpunit/tests/query/conditionals.php b/tests/phpunit/tests/query/conditionals.php
index 4b473178897ae..913e19f650de6 100644
--- a/tests/phpunit/tests/query/conditionals.php
+++ b/tests/phpunit/tests/query/conditionals.php
@@ -39,6 +39,7 @@ public function set_up() {
 		$this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
 
 		create_initial_taxonomies();
+		flush_rewrite_rules();
 	}
 
 	public function test_home() {
diff --git a/tests/phpunit/tests/rewrite.php b/tests/phpunit/tests/rewrite.php
index 085998e4b7eec..3ffb3ba2a81a2 100644
--- a/tests/phpunit/tests/rewrite.php
+++ b/tests/phpunit/tests/rewrite.php
@@ -31,6 +31,7 @@ public function tear_down() {
 		$wp_rewrite->init();
 
 		update_option( 'home', $this->home_url );
+		unset( $_SERVER['HTTPS'] );
 		unset( $this->blog_id_35531 );
 		parent::tear_down();
 	}