make tests independant of the app location

user ERL_FLAGS instead of setting the path in the shebang

52 files changed, 9 insertions, 57 deletions

diff --git a/Makefile b/Makefile
index a88b9ec32..2ac7a7aa5 100644
--- a/Makefile
+++ b/Makefile
@@ -114,8 +114,9 @@ reldocclean:
 COUCHDB_ETAP_DIR=$(BASE_DIR)/test/etap
 export COUCHDB_ETAP_DIR
 
-ERL_LIBS=$(BASE_DIR)/deps:$(BASE_DIR)/apps:$(BASE_DIR)/test/etap
-export ERL_LIBS
+
+ERL_FLAGS=-pa $(BASE_DIR)/deps/*/ebin -pa $(COUCHDB_ETAP_DIR)
+export ERL_FLAGS
 
 test: testbuild
 	prove $(COUCHDB_ETAP_DIR)/*.t
diff --git a/test/etap/001-load.t b/test/etap/001-load.t
index 9159fde15..a87dbcd2b 100755
--- a/test/etap/001-load.t
+++ b/test/etap/001-load.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/002-icu-nif.t b/test/etap/002-icu-nif.t
index ca9aa98d2..c1a46d352 100755
--- a/test/etap/002-icu-nif.t
+++ b/test/etap/002-icu-nif.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/010-file-basics.t b/test/etap/010-file-basics.t
index b4d141d2a..be3b0d6db 100755
--- a/test/etap/010-file-basics.t
+++ b/test/etap/010-file-basics.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
 % the License at
diff --git a/test/etap/011-file-headers.t b/test/etap/011-file-headers.t
index f0fbc4972..6384b9c6e 100755
--- a/test/etap/011-file-headers.t
+++ b/test/etap/011-file-headers.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap -sasl errlog_type error -boot start_sasl -noshell
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/020-btree-basics.t b/test/etap/020-btree-basics.t
index 713e83466..d5bbdee3b 100755
--- a/test/etap/020-btree-basics.t
+++ b/test/etap/020-btree-basics.t
@@ -1,6 +1,6 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap -sasl errlog_type error -boot start_sasl -noshell
+%%! -sasl errlog_type error -boot start_sasl -noshell
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/021-btree-reductions.t b/test/etap/021-btree-reductions.t
index e88c92612..5f3c2c12d 100755
--- a/test/etap/021-btree-reductions.t
+++ b/test/etap/021-btree-reductions.t
@@ -1,6 +1,6 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap -sasl errlog_type error -boot start_sasl -noshell
+%%! -sasl errlog_type error -boot start_sasl -noshell
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/030-doc-from-json.t b/test/etap/030-doc-from-json.t
index cf472927e..93cc662cc 100755
--- a/test/etap/030-doc-from-json.t
+++ b/test/etap/030-doc-from-json.t
@@ -1,6 +1,6 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap -sasl errlog_type false -noshell
+%%! -sasl errlog_type false -noshell
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/040-util.t b/test/etap/040-util.t
index 92f8635d3..ad204d47e 100755
--- a/test/etap/040-util.t
+++ b/test/etap/040-util.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
 % the License at
diff --git a/test/etap/041-uuid-gen.t b/test/etap/041-uuid-gen.t
index 85ef11a15..d1ebba127 100755
--- a/test/etap/041-uuid-gen.t
+++ b/test/etap/041-uuid-gen.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/042-work-queue.t b/test/etap/042-work-queue.t
index 7dfdec840..d87d460c2 100755
--- a/test/etap/042-work-queue.t
+++ b/test/etap/042-work-queue.t
@@ -1,6 +1,4 @@
 #!/usr/bin/env escript
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
-
 %% -*- erlang -*-
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/043-find-in-binary.t b/test/etap/043-find-in-binary.t
index d29aa8a57..dca1d9c72 100755
--- a/test/etap/043-find-in-binary.t
+++ b/test/etap/043-find-in-binary.t
@@ -1,5 +1,4 @@
 #!/usr/bin/env escript
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 %% -*- erlang -*-
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
diff --git a/test/etap/050-stream.t b/test/etap/050-stream.t
index 9b7ee3241..1a9e48d2f 100755
--- a/test/etap/050-stream.t
+++ b/test/etap/050-stream.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/060-kt-merging.t b/test/etap/060-kt-merging.t
index 4f2607653..efbdbf695 100755
--- a/test/etap/060-kt-merging.t
+++ b/test/etap/060-kt-merging.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/062-kt-remove-leaves.t b/test/etap/062-kt-remove-leaves.t
index 5267ff087..745a00be7 100755
--- a/test/etap/062-kt-remove-leaves.t
+++ b/test/etap/062-kt-remove-leaves.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/063-kt-get-leaves.t b/test/etap/063-kt-get-leaves.t
index 306d2f276..6d4e8007d 100755
--- a/test/etap/063-kt-get-leaves.t
+++ b/test/etap/063-kt-get-leaves.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/064-kt-counting.t b/test/etap/064-kt-counting.t
index 3b708ca5a..f182d2870 100755
--- a/test/etap/064-kt-counting.t
+++ b/test/etap/064-kt-counting.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/065-kt-stemming.t b/test/etap/065-kt-stemming.t
index 2e7b7f501..6e781c1d3 100755
--- a/test/etap/065-kt-stemming.t
+++ b/test/etap/065-kt-stemming.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/070-couch-db.t b/test/etap/070-couch-db.t
index 4e1c27adc..8cd08e742 100755
--- a/test/etap/070-couch-db.t
+++ b/test/etap/070-couch-db.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/072-cleanup.t b/test/etap/072-cleanup.t
index 6e78c7a7a..e38b10eda 100755
--- a/test/etap/072-cleanup.t
+++ b/test/etap/072-cleanup.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
@@ -73,7 +72,7 @@ test() ->
     {ok, AllDbs2} = couch_server:all_databases(),
     etap:ok(not lists:member(?TEST_DB, AllDbs2),
         "Database was deleted."),
-    
+
     catch test_util:stop_couch(),
     ok.
 
diff --git a/test/etap/073-changes.t b/test/etap/073-changes.t
index 5484f090b..0585c42f0 100755
--- a/test/etap/073-changes.t
+++ b/test/etap/073-changes.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/074-doc-update-conflicts.t b/test/etap/074-doc-update-conflicts.t
index 8771ac2e8..05d90baf7 100755
--- a/test/etap/074-doc-update-conflicts.t
+++ b/test/etap/074-doc-update-conflicts.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
 % the License at
diff --git a/test/etap/075-auth-cache.t b/test/etap/075-auth-cache.t
index 2e0fbcbd7..07ed92bca 100755
--- a/test/etap/075-auth-cache.t
+++ b/test/etap/075-auth-cache.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
 % the License at
diff --git a/test/etap/076-file-compression.t b/test/etap/076-file-compression.t
index 4bf116477..c82c3384e 100755
--- a/test/etap/076-file-compression.t
+++ b/test/etap/076-file-compression.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
 % the License at
diff --git a/test/etap/077-couch-db-fast-db-delete-create.t b/test/etap/077-couch-db-fast-db-delete-create.t
index d8ceda4ca..1c64dbb8b 100644
--- a/test/etap/077-couch-db-fast-db-delete-create.t
+++ b/test/etap/077-couch-db-fast-db-delete-create.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
@@ -38,7 +37,7 @@ cycle() ->
     ok.
 
 test() ->
-    test_util:start_couch(), 
+    test_util:start_couch(),
 
     {ok, _Db} = couch_db:create(<<"etap-test-db">>, []),
 
diff --git a/test/etap/080-config-get-set.t b/test/etap/080-config-get-set.t
index abc4d4e3a..9de981a5d 100755
--- a/test/etap/080-config-get-set.t
+++ b/test/etap/080-config-get-set.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
 % the License at
diff --git a/test/etap/081-config-override.t b/test/etap/081-config-override.t
index 68927bd98..b96c6ab83 100755
--- a/test/etap/081-config-override.t
+++ b/test/etap/081-config-override.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/082-config-register.t b/test/etap/082-config-register.t
index 888939653..5be8adf4a 100755
--- a/test/etap/082-config-register.t
+++ b/test/etap/082-config-register.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/083-config-no-files.t b/test/etap/083-config-no-files.t
index 0f08a3ced..0ce38e667 100755
--- a/test/etap/083-config-no-files.t
+++ b/test/etap/083-config-no-files.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/090-task-status.t b/test/etap/090-task-status.t
index 528778f49..23115bdaa 100755
--- a/test/etap/090-task-status.t
+++ b/test/etap/090-task-status.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/100-ref-counter.t b/test/etap/100-ref-counter.t
index 264b3c31d..ff2c742c6 100755
--- a/test/etap/100-ref-counter.t
+++ b/test/etap/100-ref-counter.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/120-stats-collect.t b/test/etap/120-stats-collect.t
index fdf29c19c..c1d7c75c8 100755
--- a/test/etap/120-stats-collect.t
+++ b/test/etap/120-stats-collect.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/121-stats-aggregates.t b/test/etap/121-stats-aggregates.t
index 92c4f6bd2..a89005b7b 100755
--- a/test/etap/121-stats-aggregates.t
+++ b/test/etap/121-stats-aggregates.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/130-attachments-md5.t b/test/etap/130-attachments-md5.t
index a0f6cf898..e3f2fe770 100755
--- a/test/etap/130-attachments-md5.t
+++ b/test/etap/130-attachments-md5.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/140-attachment-comp.t b/test/etap/140-attachment-comp.t
index c366feac5..095f7c006 100755
--- a/test/etap/140-attachment-comp.t
+++ b/test/etap/140-attachment-comp.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/150-invalid-view-seq.t b/test/etap/150-invalid-view-seq.t
index b8f4509c9..9c0ca1682 100755
--- a/test/etap/150-invalid-view-seq.t
+++ b/test/etap/150-invalid-view-seq.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/160-vhosts.t b/test/etap/160-vhosts.t
index 8437f3b1a..13bd46dd9 100755
--- a/test/etap/160-vhosts.t
+++ b/test/etap/160-vhosts.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License.  You may obtain a copy of
diff --git a/test/etap/170-os-daemons.t b/test/etap/170-os-daemons.t
index b91ca2b58..9a936f2b4 100755
--- a/test/etap/170-os-daemons.t
+++ b/test/etap/170-os-daemons.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License.  You may obtain a copy of
diff --git a/test/etap/171-os-daemons-config.es b/test/etap/171-os-daemons-config.es
index c42f51cb6..256750e70 100755
--- a/test/etap/171-os-daemons-config.es
+++ b/test/etap/171-os-daemons-config.es
@@ -1,6 +1,4 @@
 #! /usr/bin/env escript
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
-
 
 %
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
diff --git a/test/etap/171-os-daemons-config.t b/test/etap/171-os-daemons-config.t
index fda539ce6..27e26c591 100755
--- a/test/etap/171-os-daemons-config.t
+++ b/test/etap/171-os-daemons-config.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License.  You may obtain a copy of
diff --git a/test/etap/172-os-daemon-errors.t b/test/etap/172-os-daemon-errors.t
index 2db1a5987..7577e2d19 100755
--- a/test/etap/172-os-daemon-errors.t
+++ b/test/etap/172-os-daemon-errors.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License.  You may obtain a copy of
diff --git a/test/etap/173-os-daemon-cfg-register.t b/test/etap/173-os-daemon-cfg-register.t
index 77dda7d1b..47a57b7fb 100755
--- a/test/etap/173-os-daemon-cfg-register.t
+++ b/test/etap/173-os-daemon-cfg-register.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License.  You may obtain a copy of
diff --git a/test/etap/180-http-proxy.t b/test/etap/180-http-proxy.t
index 9aecaa049..44f00faf9 100755
--- a/test/etap/180-http-proxy.t
+++ b/test/etap/180-http-proxy.t
@@ -1,5 +1,4 @@
 #!/usr/bin/env escript
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/190-json-stream-parse.t b/test/etap/190-json-stream-parse.t
index 46d01d3e7..2568a06b3 100755
--- a/test/etap/190-json-stream-parse.t
+++ b/test/etap/190-json-stream-parse.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/200-view-group-no-db-leaks.t b/test/etap/200-view-group-no-db-leaks.t
index 4c73d7d1d..5e4f13aec 100755
--- a/test/etap/200-view-group-no-db-leaks.t
+++ b/test/etap/200-view-group-no-db-leaks.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/201-view-group-shutdown.t b/test/etap/201-view-group-shutdown.t
index 27373dee9..666cdf3ea 100755
--- a/test/etap/201-view-group-shutdown.t
+++ b/test/etap/201-view-group-shutdown.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/210-os-proc-pool.t b/test/etap/210-os-proc-pool.t
index f5f9eee9d..9e978b39e 100755
--- a/test/etap/210-os-proc-pool.t
+++ b/test/etap/210-os-proc-pool.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/220-compaction-daemon.t b/test/etap/220-compaction-daemon.t
index ea6625118..8099afef5 100755
--- a/test/etap/220-compaction-daemon.t
+++ b/test/etap/220-compaction-daemon.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/230-pbkfd2.t b/test/etap/230-pbkfd2.t
index b28edf843..d980ef698 100644
--- a/test/etap/230-pbkfd2.t
+++ b/test/etap/230-pbkfd2.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/231-cors.t b/test/etap/231-cors.t
index 9b2fecaf2..e41e33d23 100644
--- a/test/etap/231-cors.t
+++ b/test/etap/231-cors.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/etap/250-upgrade-legacy-view-files.t b/test/etap/250-upgrade-legacy-view-files.t
index 1fd9723dc..ed3aa5484 100644
--- a/test/etap/250-upgrade-legacy-view-files.t
+++ b/test/etap/250-upgrade-legacy-view-files.t
@@ -1,6 +1,5 @@
 #!/usr/bin/env escript
 %% -*- erlang -*-
-%%! -pa ./deps/*/ebin -pa ./apps/*/ebin -pa ./test/etap
 
 % Licensed under the Apache License, Version 2.0 (the "License"); you may not
 % use this file except in compliance with the License. You may obtain a copy of
diff --git a/test/javascript/test_js.escript b/test/javascript/test_js.escript
index 45f747a2e..b3657ca67 100755
--- a/test/javascript/test_js.escript
+++ b/test/javascript/test_js.escript
@@ -55,7 +55,7 @@ exec_loop(Port, Verbose, Acc) ->
     end.
 
 exec(Path, Verbose) ->
-    COUCHJS = filename:join([test_util:builddir(), "apps", "couch", "priv",
+    COUCHJS = filename:join([test_util:builddir(), "deps", "couch", "priv",
                              "couchjs"]),
     CouchUri = filename:join([test_util:testdir(), "data", "couch.uri"]),
     Cmd = string:join([COUCHJS, "-H", "-u", CouchUri,