diff --git a/assets/.htaccess b/assets/.htaccess
old mode 100755
new mode 100644
index 05d05d3..46ac7a5
--- a/assets/.htaccess
+++ b/assets/.htaccess
@@ -5,7 +5,10 @@
 #
 
 <IfModule mod_rewrite.c>
-    SetEnv HTTP_MOD_REWRITE On
+    <IfModule mod_env.c>
+        SetEnv HTTP_MOD_REWRITE On
+    </IfModule>
+
     RewriteEngine On
 
     # Disable PHP handler
@@ -23,5 +26,5 @@
     # Non existant files passed to requesthandler
     RewriteCond %{REQUEST_URI} ^(.*)$
     RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule .* ../framework/main.php?url=%1 [QSA]
+    RewriteRule .* ../vendor/silverstripe/framework/main.php?url=%1 [QSA]
 </IfModule>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 9d30d86..b97f70b 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -20,26 +20,26 @@
 
 	<testsuite name="Default">
 		<directory>mysite/tests</directory>
-		<directory>cms/tests</directory>
-		<directory>framework/tests</directory>
+		<directory>vendor/silverstripe/cms/tests/php</directory>
+		<directory>vendor/silverstripe/framework/tests/php</directory>
 	</testsuite>
 
     <!-- core components -->
     <testsuite name="core">
-		<directory>framework/tests/php/</directory>
-		<directory>silverstripe-assets/tests/php/</directory>
-        <directory>versioned/tests/php/</directory>
+		<directory>vendor/silverstripe/framework/tests/php/</directory>
+		<directory>vendor/silverstripe/assets/tests/php/</directory>
+        <directory>vendor/silverstripe/versioned/tests/php/</directory>
     </testsuite>
 
     <!-- admin components -->
     <testsuite name="admin">
-        <directory>cms/tests/</directory>
-        <directory>silverstripe-admin/tests/php/</directory>
-        <directory>campaign-admin/tests/php/</directory>
-        <directory>asset-admin/tests/php/</directory>
-        <directory>graphql/tests/</directory>
-        <directory>siteconfig/tests/</directory>
-        <directory>reports/tests/</directory>
+        <directory>vendor/silverstripe/cms/tests/</directory>
+        <directory>vendor/silverstripe/admin/tests/php/</directory>
+        <directory>vendor/silverstripe/campaign-admin/tests/php/</directory>
+        <directory>vendor/silverstripe/asset-admin/tests/php/</directory>
+        <directory>vendor/silverstripe/graphql/tests/</directory>
+        <directory>vendor/silverstripe/siteconfig/tests/php/</directory>
+        <directory>vendor/silverstripe/reports/tests/</directory>
     </testsuite>
 
 	<groups>