diff --git a/test/Aggregate/Makefile b/test/Aggregate/Makefile
index 0d6c424..c74bc13 100644
--- a/test/Aggregate/Makefile
+++ b/test/Aggregate/Makefile
@@ -17,8 +17,7 @@ DISTR := $(PKGNAME)-$(PKGVER).tar.gz
 GHCVER := $(shell ghc --numeric-version)
 GHCENV := .ghc.environment.$(MACHINE)-$(KERNEL)-$(GHCVER)
 DEPLIBS := $(MACHINE)-$(KERNEL)-ghc-$(GHCVER)
-DISTDIR := dist
-DISTV2DIR := dist-newstyle
+BUILDDIR := dist-nhm
 
 INPLACE := $(shell grep -q '^packages:.*\.\./\.\./ngx-export-tools-extra' \
                        cabal.project && echo 1 || echo 0)
@@ -26,19 +25,21 @@ INPLACE := $(shell grep -q '^packages:.*\.\./\.\./ngx-export-tools-extra' \
 all: $(DISTR)
 
 $(DISTR): $(SRC)
-	cabal install --lib --only-dependencies --package-env .
+	cabal install --builddir="$(BUILDDIR)" --lib --only-dependencies \
+	  --package-env .
 ifeq ($(INPLACE),1)
-	cabal build ngx-export-tools-extra
-	echo "package-db $$(pwd)/$(DISTV2DIR)/packagedb/ghc-$(GHCVER)" >> \
+	cabal build --builddir="$(BUILDDIR)" ngx-export-tools-extra
+	echo "package-db $$(pwd)/$(BUILDDIR)/packagedb/ghc-$(GHCVER)" >> \
 	  $(GHCENV)
 endif
 	sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
 	if ! command -v $(NHMTOOL) >/dev/null; then \
 	  PATH=$$(dirname $$(cabal list-bin $(PKGDISTR))):$$PATH; \
 	fi; \
-	$(NHMTOOL) deps $(PKGNAME) >> $(GHCENV); \
+	$(NHMTOOL) deps $(PKGNAME) -d "$(BUILDDIR)" >> $(GHCENV); \
 	runhaskell --ghc-arg=-package=base \
 	  --ghc-arg=-package=$(PKGDISTR) Setup.hs configure \
+	  --builddir="$(BUILDDIR)" \
 	  --package-db=clear --package-db=global \
 	  $$(sed -n 's/^\(package-db\)\s\+/--\1=/p' $(GHCENV)) \
 	  $$(sed -n 's/^package-id\s\+\(.*\)'` \
@@ -48,6 +49,7 @@ endif
 	  --prefix=$(PREFIX); \
 	runhaskell --ghc-arg=-package=base \
 	  --ghc-arg=-package=$(PKGDISTR) Setup.hs build \
+	  --builddir="$(BUILDDIR)" \
 	  --ghc-options="$(SRC) -o $(LIB) -ddump-splices $(LINKRTS)"
 
 install: $(DISTR)
@@ -57,7 +59,7 @@ install: $(DISTR)
 .PHONY: clean
 
 clean:
-	rm -rf $(DISTDIR) $(DISTV2DIR) $(DEPLIBS)
+	rm -rf $(BUILDDIR) $(DEPLIBS)
 	rm -f $(GHCENV) $(STUB) $(NAME).hi $(NAME).o
 	rm -f $(LIB)
 
diff --git a/test/EDE/Makefile b/test/EDE/Makefile
index 9d89203..6db0d68 100644
--- a/test/EDE/Makefile
+++ b/test/EDE/Makefile
@@ -17,8 +17,7 @@ DISTR := $(PKGNAME)-$(PKGVER).tar.gz
 GHCVER := $(shell ghc --numeric-version)
 GHCENV := .ghc.environment.$(MACHINE)-$(KERNEL)-$(GHCVER)
 DEPLIBS := $(MACHINE)-$(KERNEL)-ghc-$(GHCVER)
-DISTDIR := dist
-DISTV2DIR := dist-newstyle
+BUILDDIR := dist-nhm
 
 INPLACE := $(shell grep -q '^packages:.*\.\./\.\./ngx-export-tools-extra' \
                        cabal.project && echo 1 || echo 0)
@@ -26,19 +25,21 @@ INPLACE := $(shell grep -q '^packages:.*\.\./\.\./ngx-export-tools-extra' \
 all: $(DISTR)
 
 $(DISTR): $(SRC)
-	cabal install --lib --only-dependencies --package-env .
+	cabal install --builddir="$(BUILDDIR)" --lib --only-dependencies \
+	  --package-env .
 ifeq ($(INPLACE),1)
-	cabal build ngx-export-tools-extra
-	echo "package-db $$(pwd)/$(DISTV2DIR)/packagedb/ghc-$(GHCVER)" >> \
+	cabal build --builddir="$(BUILDDIR)" ngx-export-tools-extra
+	echo "package-db $$(pwd)/$(BUILDDIR)/packagedb/ghc-$(GHCVER)" >> \
 	  $(GHCENV)
 endif
 	sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
 	if ! command -v $(NHMTOOL) >/dev/null; then \
 	  PATH=$$(dirname $$(cabal list-bin $(PKGDISTR))):$$PATH; \
 	fi; \
-	$(NHMTOOL) deps $(PKGNAME) >> $(GHCENV); \
+	$(NHMTOOL) deps $(PKGNAME) -d "$(BUILDDIR)" >> $(GHCENV); \
 	runhaskell --ghc-arg=-package=base \
 	  --ghc-arg=-package=$(PKGDISTR) Setup.hs configure \
+	  --builddir="$(BUILDDIR)" \
 	  --package-db=clear --package-db=global \
 	  $$(sed -n 's/^\(package-db\)\s\+/--\1=/p' $(GHCENV)) \
 	  $$(sed -n 's/^package-id\s\+\(.*\)'` \
@@ -48,6 +49,7 @@ endif
 	  --prefix=$(PREFIX); \
 	runhaskell --ghc-arg=-package=base \
 	  --ghc-arg=-package=$(PKGDISTR) Setup.hs build \
+	  --builddir="$(BUILDDIR)" \
 	  --ghc-options="$(SRC) -o $(LIB) $(LINKRTS)"
 
 install: $(DISTR)
@@ -57,7 +59,7 @@ install: $(DISTR)
 .PHONY: clean
 
 clean:
-	rm -rf $(DISTDIR) $(DISTV2DIR) $(DEPLIBS)
+	rm -rf $(BUILDDIR) $(DEPLIBS)
 	rm -f $(GHCENV) $(STUB) $(NAME).hi $(NAME).o
 	rm -f $(LIB)
 
diff --git a/test/PCRE/Makefile b/test/PCRE/Makefile
index ecba9fd..4a496f1 100644
--- a/test/PCRE/Makefile
+++ b/test/PCRE/Makefile
@@ -17,8 +17,7 @@ DISTR := $(PKGNAME)-$(PKGVER).tar.gz
 GHCVER := $(shell ghc --numeric-version)
 GHCENV := .ghc.environment.$(MACHINE)-$(KERNEL)-$(GHCVER)
 DEPLIBS := $(MACHINE)-$(KERNEL)-ghc-$(GHCVER)
-DISTDIR := dist
-DISTV2DIR := dist-newstyle
+BUILDDIR := dist-nhm
 
 INPLACE := $(shell grep -q '^packages:.*\.\./\.\./ngx-export-tools-extra' \
                        cabal.project && echo 1 || echo 0)
@@ -26,19 +25,21 @@ INPLACE := $(shell grep -q '^packages:.*\.\./\.\./ngx-export-tools-extra' \
 all: $(DISTR)
 
 $(DISTR): $(SRC)
-	cabal install --lib --only-dependencies --package-env .
+	cabal install --builddir="$(BUILDDIR)" --lib --only-dependencies \
+	  --package-env .
 ifeq ($(INPLACE),1)
-	cabal build ngx-export-tools-extra
-	echo "package-db $$(pwd)/$(DISTV2DIR)/packagedb/ghc-$(GHCVER)" >> \
+	cabal build --builddir="$(BUILDDIR)" ngx-export-tools-extra
+	echo "package-db $$(pwd)/$(BUILDDIR)/packagedb/ghc-$(GHCVER)" >> \
 	  $(GHCENV)
 endif
 	sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
 	if ! command -v $(NHMTOOL) >/dev/null; then \
 	  PATH=$$(dirname $$(cabal list-bin $(PKGDISTR))):$$PATH; \
 	fi; \
-	$(NHMTOOL) deps $(PKGNAME) >> $(GHCENV); \
+	$(NHMTOOL) deps $(PKGNAME) -d "$(BUILDDIR)" >> $(GHCENV); \
 	runhaskell --ghc-arg=-package=base \
 	  --ghc-arg=-package=$(PKGDISTR) Setup.hs configure \
+	  --builddir="$(BUILDDIR)" \
 	  --package-db=clear --package-db=global \
 	  $$(sed -n 's/^\(package-db\)\s\+/--\1=/p' $(GHCENV)) \
 	  $$(sed -n 's/^package-id\s\+\(.*\)'` \
@@ -48,6 +49,7 @@ endif
 	  --prefix=$(PREFIX); \
 	runhaskell --ghc-arg=-package=base \
 	  --ghc-arg=-package=$(PKGDISTR) Setup.hs build \
+	  --builddir="$(BUILDDIR)" \
 	  --ghc-options="$(SRC) -o $(LIB) $(LINKRTS)"
 
 install: $(DISTR)
@@ -57,7 +59,7 @@ install: $(DISTR)
 .PHONY: clean
 
 clean:
-	rm -rf $(DISTDIR) $(DISTV2DIR) $(DEPLIBS)
+	rm -rf $(BUILDDIR) $(DEPLIBS)
 	rm -f $(GHCENV) $(STUB) $(NAME).hi $(NAME).o
 	rm -f $(LIB)
 
diff --git a/test/Prometheus/Makefile b/test/Prometheus/Makefile
index 53944af..82ee461 100644
--- a/test/Prometheus/Makefile
+++ b/test/Prometheus/Makefile
@@ -17,8 +17,7 @@ DISTR := $(PKGNAME)-$(PKGVER).tar.gz
 GHCVER := $(shell ghc --numeric-version)
 GHCENV := .ghc.environment.$(MACHINE)-$(KERNEL)-$(GHCVER)
 DEPLIBS := $(MACHINE)-$(KERNEL)-ghc-$(GHCVER)
-DISTDIR := dist
-DISTV2DIR := dist-newstyle
+BUILDDIR := dist-nhm
 
 INPLACE := $(shell grep -q '^packages:.*\.\./\.\./ngx-export-tools-extra' \
                        cabal.project && echo 1 || echo 0)
@@ -26,19 +25,21 @@ INPLACE := $(shell grep -q '^packages:.*\.\./\.\./ngx-export-tools-extra' \
 all: $(DISTR)
 
 $(DISTR): $(SRC)
-	cabal install --lib --only-dependencies --package-env .
+	cabal install --builddir="$(BUILDDIR)" --lib --only-dependencies \
+	  --package-env .
 ifeq ($(INPLACE),1)
-	cabal build ngx-export-tools-extra
-	echo "package-db $$(pwd)/$(DISTV2DIR)/packagedb/ghc-$(GHCVER)" >> \
+	cabal build --builddir="$(BUILDDIR)" ngx-export-tools-extra
+	echo "package-db $$(pwd)/$(BUILDDIR)/packagedb/ghc-$(GHCVER)" >> \
 	  $(GHCENV)
 endif
 	sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
 	if ! command -v $(NHMTOOL) >/dev/null; then \
 	  PATH=$$(dirname $$(cabal list-bin $(PKGDISTR))):$$PATH; \
 	fi; \
-	$(NHMTOOL) deps $(PKGNAME) >> $(GHCENV); \
+	$(NHMTOOL) deps $(PKGNAME) -d "$(BUILDDIR)" >> $(GHCENV); \
 	runhaskell --ghc-arg=-package=base \
 	  --ghc-arg=-package=$(PKGDISTR) Setup.hs configure \
+	  --builddir="$(BUILDDIR)" \
 	  --package-db=clear --package-db=global \
 	  $$(sed -n 's/^\(package-db\)\s\+/--\1=/p' $(GHCENV)) \
 	  $$(sed -n 's/^package-id\s\+\(.*\)'` \
@@ -48,6 +49,7 @@ endif
 	  --prefix=$(PREFIX); \
 	runhaskell --ghc-arg=-package=base \
 	  --ghc-arg=-package=$(PKGDISTR) Setup.hs build \
+	  --builddir="$(BUILDDIR)" \
 	  --ghc-options="$(SRC) -o $(LIB) $(LINKRTS)"
 
 install: $(DISTR)
@@ -57,7 +59,7 @@ install: $(DISTR)
 .PHONY: clean
 
 clean:
-	rm -rf $(DISTDIR) $(DISTV2DIR) $(DEPLIBS)
+	rm -rf $(BUILDDIR) $(DEPLIBS)
 	rm -f $(GHCENV) $(STUB) $(NAME).hi $(NAME).o
 	rm -f $(LIB)
 
diff --git a/test/Resolve/Makefile b/test/Resolve/Makefile
index b5682e4..1b49b68 100644
--- a/test/Resolve/Makefile
+++ b/test/Resolve/Makefile
@@ -17,8 +17,7 @@ DISTR := $(PKGNAME)-$(PKGVER).tar.gz
 GHCVER := $(shell ghc --numeric-version)
 GHCENV := .ghc.environment.$(MACHINE)-$(KERNEL)-$(GHCVER)
 DEPLIBS := $(MACHINE)-$(KERNEL)-ghc-$(GHCVER)
-DISTDIR := dist
-DISTV2DIR := dist-newstyle
+BUILDDIR := dist-nhm
 
 INPLACE := $(shell grep -q '^packages:.*\.\./\.\./ngx-export-tools-extra' \
                        cabal.project && echo 1 || echo 0)
@@ -26,19 +25,21 @@ INPLACE := $(shell grep -q '^packages:.*\.\./\.\./ngx-export-tools-extra' \
 all: $(DISTR)
 
 $(DISTR): $(SRC)
-	cabal install --lib --only-dependencies --package-env .
+	cabal install --builddir="$(BUILDDIR)" --lib --only-dependencies \
+	  --package-env .
 ifeq ($(INPLACE),1)
-	cabal build ngx-export-tools-extra
-	echo "package-db $$(pwd)/$(DISTV2DIR)/packagedb/ghc-$(GHCVER)" >> \
+	cabal build --builddir="$(BUILDDIR)" ngx-export-tools-extra
+	echo "package-db $$(pwd)/$(BUILDDIR)/packagedb/ghc-$(GHCVER)" >> \
 	  $(GHCENV)
 endif
 	sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
 	if ! command -v $(NHMTOOL) >/dev/null; then \
 	  PATH=$$(dirname $$(cabal list-bin $(PKGDISTR))):$$PATH; \
 	fi; \
-	$(NHMTOOL) deps $(PKGNAME) >> $(GHCENV); \
+	$(NHMTOOL) deps $(PKGNAME) -d "$(BUILDDIR)" >> $(GHCENV); \
 	runhaskell --ghc-arg=-package=base \
 	  --ghc-arg=-package=$(PKGDISTR) Setup.hs configure \
+	  --builddir="$(BUILDDIR)" \
 	  --package-db=clear --package-db=global \
 	  $$(sed -n 's/^\(package-db\)\s\+/--\1=/p' $(GHCENV)) \
 	  $$(sed -n 's/^package-id\s\+\(.*\)'` \
@@ -48,6 +49,7 @@ endif
 	  --prefix=$(PREFIX); \
 	runhaskell --ghc-arg=-package=base \
 	  --ghc-arg=-package=$(PKGDISTR) Setup.hs build \
+	  --builddir="$(BUILDDIR)" \
 	  --ghc-options="$(SRC) -o $(LIB) $(LINKRTS)"
 
 install: $(DISTR)
@@ -57,7 +59,7 @@ install: $(DISTR)
 .PHONY: clean
 
 clean:
-	rm -rf $(DISTDIR) $(DISTV2DIR) $(DEPLIBS)
+	rm -rf $(BUILDDIR) $(DEPLIBS)
 	rm -f $(GHCENV) $(STUB) $(NAME).hi $(NAME).o
 	rm -f $(LIB)
 
diff --git a/test/ServiceHookAdaptor/Makefile b/test/ServiceHookAdaptor/Makefile
index e54d94b..4be96b6 100644
--- a/test/ServiceHookAdaptor/Makefile
+++ b/test/ServiceHookAdaptor/Makefile
@@ -17,8 +17,7 @@ DISTR := $(PKGNAME)-$(PKGVER).tar.gz
 GHCVER := $(shell ghc --numeric-version)
 GHCENV := .ghc.environment.$(MACHINE)-$(KERNEL)-$(GHCVER)
 DEPLIBS := $(MACHINE)-$(KERNEL)-ghc-$(GHCVER)
-DISTDIR := dist
-DISTV2DIR := dist-newstyle
+BUILDDIR := dist-nhm
 
 INPLACE := $(shell grep -q '^packages:.*\.\./\.\./ngx-export-tools-extra' \
                        cabal.project && echo 1 || echo 0)
@@ -26,19 +25,21 @@ INPLACE := $(shell grep -q '^packages:.*\.\./\.\./ngx-export-tools-extra' \
 all: $(DISTR)
 
 $(DISTR): $(SRC)
-	cabal install --lib --only-dependencies --package-env .
+	cabal install --builddir="$(BUILDDIR)" --lib --only-dependencies \
+	  --package-env .
 ifeq ($(INPLACE),1)
-	cabal build ngx-export-tools-extra
-	echo "package-db $$(pwd)/$(DISTV2DIR)/packagedb/ghc-$(GHCVER)" >> \
+	cabal build --builddir="$(BUILDDIR)" ngx-export-tools-extra
+	echo "package-db $$(pwd)/$(BUILDDIR)/packagedb/ghc-$(GHCVER)" >> \
 	  $(GHCENV)
 endif
 	sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
 	if ! command -v $(NHMTOOL) >/dev/null; then \
 	  PATH=$$(dirname $$(cabal list-bin $(PKGDISTR))):$$PATH; \
 	fi; \
-	$(NHMTOOL) deps $(PKGNAME) >> $(GHCENV); \
+	$(NHMTOOL) deps $(PKGNAME) -d "$(BUILDDIR)" >> $(GHCENV); \
 	runhaskell --ghc-arg=-package=base \
 	  --ghc-arg=-package=$(PKGDISTR) Setup.hs configure \
+	  --builddir="$(BUILDDIR)" \
 	  --package-db=clear --package-db=global \
 	  $$(sed -n 's/^\(package-db\)\s\+/--\1=/p' $(GHCENV)) \
 	  $$(sed -n 's/^package-id\s\+\(.*\)'` \
@@ -48,6 +49,7 @@ endif
 	  --prefix=$(PREFIX); \
 	runhaskell --ghc-arg=-package=base \
 	  --ghc-arg=-package=$(PKGDISTR) Setup.hs build \
+	  --builddir="$(BUILDDIR)" \
 	  --ghc-options="$(SRC) -o $(LIB) $(LINKRTS)"
 
 install: $(DISTR)
@@ -57,7 +59,7 @@ install: $(DISTR)
 .PHONY: clean
 
 clean:
-	rm -rf $(DISTDIR) $(DISTV2DIR) $(DEPLIBS)
+	rm -rf $(BUILDDIR) $(DEPLIBS)
 	rm -f $(GHCENV) $(STUB) $(NAME).hi $(NAME).o
 	rm -f $(LIB)
 
diff --git a/test/Subrequest/Makefile b/test/Subrequest/Makefile
index f27df1a..f5ca3d7 100644
--- a/test/Subrequest/Makefile
+++ b/test/Subrequest/Makefile
@@ -17,8 +17,7 @@ DISTR := $(PKGNAME)-$(PKGVER).tar.gz
 GHCVER := $(shell ghc --numeric-version)
 GHCENV := .ghc.environment.$(MACHINE)-$(KERNEL)-$(GHCVER)
 DEPLIBS := $(MACHINE)-$(KERNEL)-ghc-$(GHCVER)
-DISTDIR := dist
-DISTV2DIR := dist-newstyle
+BUILDDIR := dist-nhm
 
 INPLACE := $(shell grep -q '^packages:.*\.\./\.\./ngx-export-tools-extra' \
                        cabal.project && echo 1 || echo 0)
@@ -26,19 +25,21 @@ INPLACE := $(shell grep -q '^packages:.*\.\./\.\./ngx-export-tools-extra' \
 all: $(DISTR)
 
 $(DISTR): $(SRC)
-	cabal install --lib --only-dependencies --package-env .
+	cabal install --builddir="$(BUILDDIR)" --lib --only-dependencies \
+	  --package-env .
 ifeq ($(INPLACE),1)
-	cabal build ngx-export-tools-extra
-	echo "package-db $$(pwd)/$(DISTV2DIR)/packagedb/ghc-$(GHCVER)" >> \
+	cabal build --builddir="$(BUILDDIR)" ngx-export-tools-extra
+	echo "package-db $$(pwd)/$(BUILDDIR)/packagedb/ghc-$(GHCVER)" >> \
 	  $(GHCENV)
 endif
 	sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
 	if ! command -v $(NHMTOOL) >/dev/null; then \
 	  PATH=$$(dirname $$(cabal list-bin $(PKGDISTR))):$$PATH; \
 	fi; \
-	$(NHMTOOL) deps $(PKGNAME) >> $(GHCENV); \
+	$(NHMTOOL) deps $(PKGNAME) -d "$(BUILDDIR)" >> $(GHCENV); \
 	runhaskell --ghc-arg=-package=base \
 	  --ghc-arg=-package=$(PKGDISTR) Setup.hs configure \
+	  --builddir="$(BUILDDIR)" \
 	  --package-db=clear --package-db=global \
 	  $$(sed -n 's/^\(package-db\)\s\+/--\1=/p' $(GHCENV)) \
 	  $$(sed -n 's/^package-id\s\+\(.*\)'` \
@@ -48,6 +49,7 @@ endif
 	  --prefix=$(PREFIX); \
 	runhaskell --ghc-arg=-package=base \
 	  --ghc-arg=-package=$(PKGDISTR) Setup.hs build \
+	  --builddir="$(BUILDDIR)" \
 	  --ghc-options="$(SRC) -o $(LIB) $(LINKRTS)"
 
 install: $(DISTR)
@@ -57,7 +59,7 @@ install: $(DISTR)
 .PHONY: clean
 
 clean:
-	rm -rf $(DISTDIR) $(DISTV2DIR) $(DEPLIBS)
+	rm -rf $(BUILDDIR) $(DEPLIBS)
 	rm -f $(GHCENV) $(STUB) $(NAME).hi $(NAME).o
 	rm -f $(LIB)