diff --git a/persistence-modules/java-jpa-3/pom.xml b/persistence-modules/java-jpa-3/pom.xml
index cecabc10cc..aef35b0547 100644
--- a/persistence-modules/java-jpa-3/pom.xml
+++ b/persistence-modules/java-jpa-3/pom.xml
@@ -74,6 +74,12 @@
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>1.16.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/persistence-modules/java-jpa-3/src/main/java/com/baeldung/jpa/postgresql_schema/Product.java b/persistence-modules/java-jpa-3/src/main/java/com/baeldung/jpa/postgresql_schema/Product.java
new file mode 100644
index 0000000000..cf74e8bb6d
--- /dev/null
+++ b/persistence-modules/java-jpa-3/src/main/java/com/baeldung/jpa/postgresql_schema/Product.java
@@ -0,0 +1,30 @@
+package com.baeldung.jpa.postgresql_schema;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "product", schema = "store")
+public class Product {
+
+    @Id
+    private int id;
+    private String name;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/persistence-modules/java-jpa-3/src/main/resources/META-INF/persistence.xml b/persistence-modules/java-jpa-3/src/main/resources/META-INF/persistence.xml
index 1166aaca71..ef1c4fb3d3 100644
--- a/persistence-modules/java-jpa-3/src/main/resources/META-INF/persistence.xml
+++ b/persistence-modules/java-jpa-3/src/main/resources/META-INF/persistence.xml
@@ -149,4 +149,15 @@
             <property name="hibernate.temp.use_jdbc_metadata_defaults" value="false"/>
         </properties>
     </persistence-unit>
+    <persistence-unit name="postgresql_schema_unit">
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+        <class>com.baeldung.jpa.postgresql_schema.Product</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <properties>
+            <property name="hibernate.connection.driver" value="org.postgresql.Driver"/>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQL10Dialect"/>
+            <property name="hibernate.format_sql" value="true"/>
+            <property name="hibernate.temp.use_jdbc_metadata_defaults" value="false"/>
+        </properties>
+    </persistence-unit>
 </persistence>
diff --git a/persistence-modules/java-jpa-3/src/test/java/com/baeldung/jpa/postgresql_schema/PostgresqlSchemaLiveTest.java b/persistence-modules/java-jpa-3/src/test/java/com/baeldung/jpa/postgresql_schema/PostgresqlSchemaLiveTest.java
new file mode 100644
index 0000000000..e46ea2892c
--- /dev/null
+++ b/persistence-modules/java-jpa-3/src/test/java/com/baeldung/jpa/postgresql_schema/PostgresqlSchemaLiveTest.java
@@ -0,0 +1,85 @@
+package com.baeldung.jpa.postgresql_schema;
+
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.postgresql.ds.PGSimpleDataSource;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class PostgresqlSchemaLiveTest {
+    //This tests require running Docker application with working internet connection to fetch
+    //Postgres image if the image is not available locally.
+
+    @ClassRule
+    public static PostgresqlTestContainer container = PostgresqlTestContainer.getInstance();
+
+
+    @BeforeClass
+    public static void setup() throws Exception {
+        Properties properties = new Properties();
+        properties.setProperty("user", container.getUsername());
+        properties.setProperty("password", container.getPassword());
+        Connection connection = DriverManager.getConnection(container.getJdbcUrl(), properties);
+        connection.createStatement().execute("CREATE SCHEMA store");
+        connection.createStatement().execute("CREATE TABLE store.product(id SERIAL PRIMARY KEY, name VARCHAR(20))");
+        connection.createStatement().execute("INSERT INTO store.product VALUES(1, 'test product')");
+    }
+
+    @Test
+    public void settingUpSchemaUsingJdbcURL() throws Exception {
+        Properties properties = new Properties();
+        properties.setProperty("user", container.getUsername());
+        properties.setProperty("password", container.getPassword());
+        Connection connection = DriverManager.getConnection(container.getJdbcUrl().concat("&currentSchema=store"), properties);
+
+        ResultSet resultSet = connection.createStatement().executeQuery("SELECT * FROM product");
+        resultSet.next();
+
+        assertThat(resultSet.getInt(1), equalTo(1));
+        assertThat(resultSet.getString(2), equalTo("test product"));
+    }
+
+    @Test
+    public void settingUpSchemaUsingPGSimpleDataSource() throws Exception {
+        int port = Integer.parseInt(container.getJdbcUrl().substring(container.getJdbcUrl().lastIndexOf(":") + 1, container.getJdbcUrl().lastIndexOf("/")));
+        PGSimpleDataSource ds = new PGSimpleDataSource();
+        ds.setServerNames(new String[]{container.getHost()});
+        ds.setPortNumbers(new int[]{port});
+        ds.setUser(container.getUsername());
+        ds.setPassword(container.getPassword());
+        ds.setDatabaseName("test");
+        ds.setCurrentSchema("store");
+
+        ResultSet resultSet = ds.getConnection().createStatement().executeQuery("SELECT * FROM product");
+        resultSet.next();
+
+        assertThat(resultSet.getInt(1), equalTo(1));
+        assertThat(resultSet.getString(2), equalTo("test product"));
+    }
+
+    @Test
+    public void settingUpSchemaUsingTableAnnotation() {
+        Map<String, String> props = new HashMap<>();
+        props.put("hibernate.connection.url", container.getJdbcUrl());
+        props.put("hibernate.connection.user", container.getUsername());
+        props.put("hibernate.connection.password", container.getPassword());
+        EntityManagerFactory emf = Persistence.createEntityManagerFactory("postgresql_schema_unit", props);
+        EntityManager entityManager = emf.createEntityManager();
+
+        Product product = entityManager.find(Product.class, 1);
+
+        assertThat(product.getName(), equalTo("test product"));
+    }
+}
diff --git a/persistence-modules/java-jpa-3/src/test/java/com/baeldung/jpa/postgresql_schema/PostgresqlTestContainer.java b/persistence-modules/java-jpa-3/src/test/java/com/baeldung/jpa/postgresql_schema/PostgresqlTestContainer.java
new file mode 100644
index 0000000000..edc84845c6
--- /dev/null
+++ b/persistence-modules/java-jpa-3/src/test/java/com/baeldung/jpa/postgresql_schema/PostgresqlTestContainer.java
@@ -0,0 +1,22 @@
+package com.baeldung.jpa.postgresql_schema;
+
+import org.testcontainers.containers.PostgreSQLContainer;
+
+public class PostgresqlTestContainer  extends PostgreSQLContainer<PostgresqlTestContainer> {
+
+    private static final String IMAGE_VERSION = "postgres";
+
+    private static PostgresqlTestContainer container;
+
+
+    private PostgresqlTestContainer() {
+        super(IMAGE_VERSION);
+    }
+
+    public static PostgresqlTestContainer getInstance() {
+        if (container == null) {
+            container = new PostgresqlTestContainer();
+        }
+        return container;
+    }
+}