diff --git a/autotest.sh b/autotest.sh
index 6372b4cf7..badb1be11 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -115,7 +115,7 @@ if [ $SPDK_TEST_NVME -eq 1 ]; then
 	fi
 fi
 
-run_test test/lib/env/env.sh
+run_test test/env/env.sh
 
 if [ $SPDK_TEST_IOAT -eq 1 ]; then
 	run_test test/ioat/ioat.sh
diff --git a/test/Makefile b/test/Makefile
index ed024023f..fc61af031 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 # These directories contain tests.
-TESTDIRS = app bdev blobfs cpp_headers lib nvme unit
+TESTDIRS = app bdev blobfs cpp_headers env lib nvme unit
 
 DIRS-y = $(TESTDIRS)
 
diff --git a/test/lib/env/Makefile b/test/env/Makefile
similarity index 97%
rename from test/lib/env/Makefile
rename to test/env/Makefile
index 79a3d5ffa..e340bd6ab 100644
--- a/test/lib/env/Makefile
+++ b/test/env/Makefile
@@ -31,7 +31,7 @@
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
+SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 DIRS-y = memory pci vtophys
diff --git a/test/lib/env/env.sh b/test/env/env.sh
similarity index 89%
rename from test/lib/env/env.sh
rename to test/env/env.sh
index 1e5936a39..7aa560f2e 100755
--- a/test/lib/env/env.sh
+++ b/test/env/env.sh
@@ -3,7 +3,7 @@
 set -e
 
 testdir=$(readlink -f $(dirname $0))
-rootdir=$(readlink -f $testdir/../../..)
+rootdir=$(readlink -f $testdir/../..)
 source $rootdir/test/common/autotest_common.sh
 
 timing_enter env
diff --git a/test/lib/env/memory/.gitignore b/test/env/memory/.gitignore
similarity index 100%
rename from test/lib/env/memory/.gitignore
rename to test/env/memory/.gitignore
diff --git a/test/lib/env/memory/Makefile b/test/env/memory/Makefile
similarity index 97%
rename from test/lib/env/memory/Makefile
rename to test/env/memory/Makefile
index c121489cf..1a9b208df 100644
--- a/test/lib/env/memory/Makefile
+++ b/test/env/memory/Makefile
@@ -31,7 +31,7 @@
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
+SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
diff --git a/test/lib/env/memory/memory_ut.c b/test/env/memory/memory_ut.c
similarity index 100%
rename from test/lib/env/memory/memory_ut.c
rename to test/env/memory/memory_ut.c
diff --git a/test/lib/env/pci/.gitignore b/test/env/pci/.gitignore
similarity index 100%
rename from test/lib/env/pci/.gitignore
rename to test/env/pci/.gitignore
diff --git a/test/lib/env/pci/Makefile b/test/env/pci/Makefile
similarity index 97%
rename from test/lib/env/pci/Makefile
rename to test/env/pci/Makefile
index a0fa4ee66..e41c7fd33 100644
--- a/test/lib/env/pci/Makefile
+++ b/test/env/pci/Makefile
@@ -31,7 +31,7 @@
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
+SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
diff --git a/test/lib/env/pci/pci_ut.c b/test/env/pci/pci_ut.c
similarity index 100%
rename from test/lib/env/pci/pci_ut.c
rename to test/env/pci/pci_ut.c
diff --git a/test/lib/env/.gitignore b/test/env/vtophys/.gitignore
similarity index 100%
rename from test/lib/env/.gitignore
rename to test/env/vtophys/.gitignore
diff --git a/test/lib/env/vtophys/Makefile b/test/env/vtophys/Makefile
similarity index 97%
rename from test/lib/env/vtophys/Makefile
rename to test/env/vtophys/Makefile
index 2f0d13ae4..b3553b6ca 100644
--- a/test/lib/env/vtophys/Makefile
+++ b/test/env/vtophys/Makefile
@@ -31,7 +31,7 @@
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
+SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
diff --git a/test/lib/env/vtophys/vtophys.c b/test/env/vtophys/vtophys.c
similarity index 100%
rename from test/lib/env/vtophys/vtophys.c
rename to test/env/vtophys/vtophys.c
diff --git a/test/lib/Makefile b/test/lib/Makefile
index eb6dc6530..3db47213d 100644
--- a/test/lib/Makefile
+++ b/test/lib/Makefile
@@ -34,7 +34,7 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-DIRS-y = env event json
+DIRS-y = event json
 
 .PHONY: all clean $(DIRS-y)