diff --git a/author-book/src/test/java/com/bobocode/config/SimpleSqlFormatter.java b/author-book/src/test/java/com/bobocode/config/SimpleSqlFormatter.java
new file mode 100644
index 0000000..de3d584
--- /dev/null
+++ b/author-book/src/test/java/com/bobocode/config/SimpleSqlFormatter.java
@@ -0,0 +1,18 @@
+package com.bobocode.config;
+
+import com.p6spy.engine.spy.appender.MessageFormattingStrategy;
+import org.hibernate.engine.jdbc.internal.BasicFormatterImpl;
+import org.hibernate.engine.jdbc.internal.Formatter;
+
+public class SimpleSqlFormatter implements MessageFormattingStrategy {
+    private final Formatter formatter = new BasicFormatterImpl();
+
+    @Override
+    public String formatMessage(int connectionId, String now, long elapsed, String category, String prepared, String sql, String url) {
+        if (sql.isEmpty()) {
+            return "";
+        }
+        return formatter.format(sql);
+    }
+
+}
diff --git a/author-book/src/test/resources/META-INF/persistence.xml b/author-book/src/test/resources/META-INF/persistence.xml
new file mode 100644
index 0000000..9098a88
--- /dev/null
+++ b/author-book/src/test/resources/META-INF/persistence.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence" version="2.1">
+
+    <persistence-unit name="BookAuthors">
+        <class>com.bobocode.model.Book</class>
+        <class>com.bobocode.model.Author</class>
+
+        <properties>
+            <property name="hibernate.connection.url" value="jdbc:p6spy:h2:mem:bobocode_db;DB_CLOSE_DELAY=-1"/>
+            <property name="hibernate.connection.driver_class" value="com.p6spy.engine.spy.P6SpyDriver"/>
+            <property name="hibernate.connection.username" value="bobouser"/>
+            <property name="hibernate.connection.password" value="bobopass"/>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
+            <property name="hibernate.format_sql" value="true"/>
+            <property name="hibernate.hbm2ddl.auto" value="create"/>
+        </properties>
+    </persistence-unit>
+
+</persistence>
diff --git a/author-book/src/test/resources/spy.properties b/author-book/src/test/resources/spy.properties
new file mode 100644
index 0000000..c93d4f1
--- /dev/null
+++ b/author-book/src/test/resources/spy.properties
@@ -0,0 +1,3 @@
+driverlist=org.h2.Driver
+appender=com.p6spy.engine.spy.appender.StdoutLogger
+logMessageFormat=com.bobocode.config.SimpleSqlFormatter
\ No newline at end of file
diff --git a/company-products/src/test/java/com/bobocode/config/SimpleSqlFormatter.java b/company-products/src/test/java/com/bobocode/config/SimpleSqlFormatter.java
new file mode 100644
index 0000000..de3d584
--- /dev/null
+++ b/company-products/src/test/java/com/bobocode/config/SimpleSqlFormatter.java
@@ -0,0 +1,18 @@
+package com.bobocode.config;
+
+import com.p6spy.engine.spy.appender.MessageFormattingStrategy;
+import org.hibernate.engine.jdbc.internal.BasicFormatterImpl;
+import org.hibernate.engine.jdbc.internal.Formatter;
+
+public class SimpleSqlFormatter implements MessageFormattingStrategy {
+    private final Formatter formatter = new BasicFormatterImpl();
+
+    @Override
+    public String formatMessage(int connectionId, String now, long elapsed, String category, String prepared, String sql, String url) {
+        if (sql.isEmpty()) {
+            return "";
+        }
+        return formatter.format(sql);
+    }
+
+}
diff --git a/company-products/src/test/resources/META-INF/persistence.xml b/company-products/src/test/resources/META-INF/persistence.xml
new file mode 100644
index 0000000..5e47e0d
--- /dev/null
+++ b/company-products/src/test/resources/META-INF/persistence.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence" version="2.1">
+
+    <persistence-unit name="CompanyProducts">
+        <class>com.bobocode.model.Company</class>
+        <class>com.bobocode.model.Product</class>
+
+        <properties>
+            <property name="hibernate.connection.url" value="jdbc:p6spy:h2:mem:bobocode_db;DB_CLOSE_DELAY=-1"/>
+            <property name="hibernate.connection.driver_class" value="com.p6spy.engine.spy.P6SpyDriver"/>
+            <property name="hibernate.connection.username" value="bobouser"/>
+            <property name="hibernate.connection.password" value="bobopass"/>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
+            <property name="hibernate.format_sql" value="true"/>
+            <property name="hibernate.hbm2ddl.auto" value="create"/>
+        </properties>
+    </persistence-unit>
+
+</persistence>
diff --git a/company-products/src/test/resources/spy.properties b/company-products/src/test/resources/spy.properties
new file mode 100644
index 0000000..c93d4f1
--- /dev/null
+++ b/company-products/src/test/resources/spy.properties
@@ -0,0 +1,3 @@
+driverlist=org.h2.Driver
+appender=com.p6spy.engine.spy.appender.StdoutLogger
+logMessageFormat=com.bobocode.config.SimpleSqlFormatter
\ No newline at end of file
diff --git a/photo-comment-dao/src/test/java/com/bobocode/config/SimpleSqlFormatter.java b/photo-comment-dao/src/test/java/com/bobocode/config/SimpleSqlFormatter.java
new file mode 100644
index 0000000..de3d584
--- /dev/null
+++ b/photo-comment-dao/src/test/java/com/bobocode/config/SimpleSqlFormatter.java
@@ -0,0 +1,18 @@
+package com.bobocode.config;
+
+import com.p6spy.engine.spy.appender.MessageFormattingStrategy;
+import org.hibernate.engine.jdbc.internal.BasicFormatterImpl;
+import org.hibernate.engine.jdbc.internal.Formatter;
+
+public class SimpleSqlFormatter implements MessageFormattingStrategy {
+    private final Formatter formatter = new BasicFormatterImpl();
+
+    @Override
+    public String formatMessage(int connectionId, String now, long elapsed, String category, String prepared, String sql, String url) {
+        if (sql.isEmpty()) {
+            return "";
+        }
+        return formatter.format(sql);
+    }
+
+}
diff --git a/photo-comment-dao/src/test/resources/META-INF/persistence.xml b/photo-comment-dao/src/test/resources/META-INF/persistence.xml
new file mode 100644
index 0000000..2e20395
--- /dev/null
+++ b/photo-comment-dao/src/test/resources/META-INF/persistence.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence" version="2.1">
+
+    <persistence-unit name="PhotoComments">
+        <class>com.bobocode.model.Photo</class>
+        <class>com.bobocode.model.PhotoComment</class>
+
+        <properties>
+            <property name="hibernate.connection.url" value="jdbc:p6spy:h2:mem:movie_db;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=false"/>
+            <property name="hibernate.connection.driver_class" value="com.p6spy.engine.spy.P6SpyDriver"/>
+            <property name="hibernate.connection.username" value="movie_user"/>
+            <property name="hibernate.connection.password" value="movie_pass"/>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
+            <property name="hibernate.hbm2ddl.auto" value="create"/>
+            <property name="hibernate.format_sql" value="true"/>
+        </properties>
+    </persistence-unit>
+
+</persistence>
diff --git a/photo-comment-dao/src/test/resources/spy.properties b/photo-comment-dao/src/test/resources/spy.properties
new file mode 100644
index 0000000..c93d4f1
--- /dev/null
+++ b/photo-comment-dao/src/test/resources/spy.properties
@@ -0,0 +1,3 @@
+driverlist=org.h2.Driver
+appender=com.p6spy.engine.spy.appender.StdoutLogger
+logMessageFormat=com.bobocode.config.SimpleSqlFormatter
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e7d9da5..fbbff4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,12 @@
             <version>3.8</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>p6spy</groupId>
+            <artifactId>p6spy</artifactId>
+            <version>3.8.2</version>
+        </dependency>
     </dependencies>
 
     <build>