diff --git a/cuba.ipr b/cuba.ipr
index 981349c117..dd754f27ac 100644
--- a/cuba.ipr
+++ b/cuba.ipr
@@ -57,6 +57,10 @@
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
     <option name="DEPLOY_AFTER_MAKE" value="0" />
+    <excludeFromCompile>
+      <directory url="file://$PROJECT_DIR$/modules/core/src/com/haulmont/cuba/core/entity" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/modules/core/src/com/haulmont/cuba/security/entity" includeSubdirectories="true" />
+    </excludeFromCompile>
     <resourceExtensions>
       <entry name=".+\.(properties|xml|html|dtd|tld)" />
       <entry name=".+\.(gif|png|jpeg|jpg)" />
diff --git a/modules/core/src/com/haulmont/cuba/core/entity/BaseUuidEntity.java b/modules/core/src/com/haulmont/cuba/core/entity/BaseUuidEntity.java
index 803def03f1..3ad819b736 100644
--- a/modules/core/src/com/haulmont/cuba/core/entity/BaseUuidEntity.java
+++ b/modules/core/src/com/haulmont/cuba/core/entity/BaseUuidEntity.java
@@ -33,6 +33,10 @@ public class BaseUuidEntity implements BaseEntity<UUID>
     @Column(name = "CREATED_BY", length = PersistenceProvider.LOGIN_FIELD_LEN)
     private String createdBy;
 
+    public BaseUuidEntity() {
+        id = UuidProvider.createUuid();
+    }
+
     public UUID getId() {
         return id;
     }
diff --git a/modules/core/test/com/haulmont/cuba/core/PersistenceTest.java b/modules/core/test/com/haulmont/cuba/core/PersistenceTest.java
index 0e4d255ddf..6cdbc29072 100644
--- a/modules/core/test/com/haulmont/cuba/core/PersistenceTest.java
+++ b/modules/core/test/com/haulmont/cuba/core/PersistenceTest.java
@@ -26,8 +26,7 @@ public class PersistenceTest extends CubaTestCase
             EntityManagerAdapter em = PersistenceProvider.getEntityManager();
             assertNotNull(em);
             Server server = new Server();
-            id = UuidProvider.createUuid();
-            server.setId(id);
+            id = server.getId();
             server.setName("localhost");
             server.setAddress("127.0.0.1");
             server.setRunning(true);
diff --git a/modules/core/test/com/haulmont/cuba/security/UserRoleTest.java b/modules/core/test/com/haulmont/cuba/security/UserRoleTest.java
index c026e8f9b5..78779ecb83 100644
--- a/modules/core/test/com/haulmont/cuba/security/UserRoleTest.java
+++ b/modules/core/test/com/haulmont/cuba/security/UserRoleTest.java
@@ -28,25 +28,21 @@ public class UserRoleTest extends CubaTestCase
             EntityManagerAdapter em = PersistenceProvider.getEntityManager();
 
             User user = new User();
-            UUID userId = UuidProvider.createUuid();
-            user.setId(userId);
+            UUID userId = user.getId();
             user.setLogin("testUser1");
             user.setName("Test User 1");
             em.persist(user);
 
             Role role = new Role();
-            role.setId(UuidProvider.createUuid());
             role.setName("testRole1");
             em.persist(role);
 
             Profile profile = new Profile();
-            profile.setId(UuidProvider.createUuid());
             profile.setName("testProfile");
             profile.setUser(user);
             em.persist(profile);
 
             ProfileRole profileRole = new ProfileRole();
-            profileRole.setId(UuidProvider.createUuid());
             profileRole.setProfile(profile);
             profileRole.setRole(role);
             em.persist(profileRole);