diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..2331ff98387e4769424df1244d01146e278c3861
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,18 @@
+all: run
+
+clean:
+	@docker-compose -f docker-compose.yml down
+
+clean_test:
+	@docker-compose -f docker-compose.test.yml down
+
+_run_tests:
+	@docker-compose -f docker-compose.test.yml run test_builder mvn test
+
+build:
+	@docker-compose build
+
+test: _run_tests clean_test
+
+run:
+	@docker-compose -f docker-compose.yml up
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
new file mode 100644
index 0000000000000000000000000000000000000000..37288f4932c8c19898ce1699faeb76913671621c
--- /dev/null
+++ b/docker-compose.test.yml
@@ -0,0 +1,20 @@
+version: '3.7'
+
+services:
+  test_builder:
+    build: .
+    container_name: 'test_corporate_builder'
+    volumes:
+      - .:/app/
+    working_dir: '/app/'
+    depends_on:
+      - test_db
+    command: mvn clean test
+
+  test_db:
+    image: 'postgres:10-alpine'
+    container_name: 'test_corporate_db'
+    environment:
+      POSTGRES_DB: cinema
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 8de8dc7916deadd7980528d68c601f0b7c32da5b..834b429dc26d5fadb8186eea4a1e5d8b1bd073d4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,7 +35,7 @@ services:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
     volumes:
-      - ./db_data:/var/lib/postgresql/data
+      - .db_data:/var/lib/postgresql/data
 
   adminer:
     image: adminer