diff --git a/Makefile b/Makefile
index f13e571cffbd03c82646adb178af1d6349e63da6..197bcb6da81d43e646c7458b46794dcd080ab9b8 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ PROJECT_DOCKER_RUN_ARGS := --link db:db
 
 default: build
 
-.PHONY: test run test-only test-lint fmt test-with-build build docs
+.PHONY: test run test-all test-utils test-server test-steem test-lint fmt test-with-build build docs
 
 docs:
 	pdoc --html hive --html-dir docs --overwrite
@@ -37,13 +37,22 @@ db-head-state:
 ipython:
 	docker run -it $(PROJECT_DOCKER_RUN_ARGS) $(PROJECT_DOCKER_TAG) ipython
 
-test: test-only test-lint
+test: test-all test-lint
 
 test-with-build: test build
 
-test-only:
+test-all:
 	py.test --cov=hive --capture=sys
 
+test-utils:
+	py.test tests/utils --cov=hive/utils --capture=sys
+
+test-steem:
+	py.test tests/steem --cov=hive/steem --capture=sys
+
+test-server:
+	py.test tests/server --cov=hive/server --capture=sys
+
 test-lint:
 	py.test --pylint -m pylint $(PROJECT_NAME) --pylint-error-types WEF
 
diff --git a/tests/test_server_condenser_api.py b/tests/server/test_server_condenser_api.py
similarity index 100%
rename from tests/test_server_condenser_api.py
rename to tests/server/test_server_condenser_api.py
diff --git a/tests/test_steem_client.py b/tests/steem/test_steem_client.py
similarity index 100%
rename from tests/test_steem_client.py
rename to tests/steem/test_steem_client.py
diff --git a/tests/test_imports.py b/tests/utils/test_imports.py
similarity index 100%
rename from tests/test_imports.py
rename to tests/utils/test_imports.py
diff --git a/tests/test_utils_account.py b/tests/utils/test_utils_account.py
similarity index 100%
rename from tests/test_utils_account.py
rename to tests/utils/test_utils_account.py
diff --git a/tests/test_utils_normalize.py b/tests/utils/test_utils_normalize.py
similarity index 100%
rename from tests/test_utils_normalize.py
rename to tests/utils/test_utils_normalize.py
diff --git a/tests/test_utils_post.py b/tests/utils/test_utils_post.py
similarity index 100%
rename from tests/test_utils_post.py
rename to tests/utils/test_utils_post.py