diff --git a/model/model-impl/src/test/resources/lens/ppolicy/password-policy-complex.xml b/model/model-impl/src/test/resources/lens/ppolicy/password-policy-complex.xml
index 9979ed5dfc4..9bb43b7bc11 100644
--- a/model/model-impl/src/test/resources/lens/ppolicy/password-policy-complex.xml
+++ b/model/model-impl/src/test/resources/lens/ppolicy/password-policy-complex.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2017 Evolveum and contributors
+  ~ Copyright (c) 2010-2019 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -11,13 +11,6 @@
     >
     <name>Testing Complex Password Policy</name>
     <description>Testing complex password policy</description>
-    <lifetime>
-        <expiration>999</expiration>
-        <warnBeforeExpiration>9</warnBeforeExpiration>
-        <lockAfterExpiration>0</lockAfterExpiration>
-        <minPasswordAge>0</minPasswordAge>
-        <passwordHistoryLength>0</passwordHistoryLength>
-    </lifetime>
     <stringPolicy>
         <description>Testing string policy</description>
         <limitations>
diff --git a/model/model-impl/src/test/resources/lens/ppolicy/password-policy-long.xml b/model/model-impl/src/test/resources/lens/ppolicy/password-policy-long.xml
index 6f41f83683f..883a5ca52ae 100644
--- a/model/model-impl/src/test/resources/lens/ppolicy/password-policy-long.xml
+++ b/model/model-impl/src/test/resources/lens/ppolicy/password-policy-long.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2017 Evolveum and contributors
+  ~ Copyright (c) 2010-2019 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -9,13 +9,6 @@
 <valuePolicy xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <name>Testing Long Password Policy</name>
-    <lifetime>
-        <expiration>999</expiration>
-        <warnBeforeExpiration>9</warnBeforeExpiration>
-        <lockAfterExpiration>0</lockAfterExpiration>
-        <minPasswordAge>0</minPasswordAge>
-        <passwordHistoryLength>0</passwordHistoryLength>
-    </lifetime>
     <stringPolicy>
         <limitations>
             <minLength>15</minLength>
diff --git a/model/model-impl/src/test/resources/lens/ppolicy/password-policy-minimal.xml b/model/model-impl/src/test/resources/lens/ppolicy/password-policy-minimal.xml
index d4a4ac2bb8d..2bbdde3225b 100644
--- a/model/model-impl/src/test/resources/lens/ppolicy/password-policy-minimal.xml
+++ b/model/model-impl/src/test/resources/lens/ppolicy/password-policy-minimal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2017 Evolveum and contributors
+  ~ Copyright (c) 2010-2019 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -11,13 +11,6 @@
     >
     <name>Testing Minimal Password Policy</name>
     <description>Testing minimal password policy</description>
-    <lifetime>
-        <expiration>999</expiration>
-        <warnBeforeExpiration>9</warnBeforeExpiration>
-        <lockAfterExpiration>0</lockAfterExpiration>
-        <minPasswordAge>0</minPasswordAge>
-        <passwordHistoryLength>0</passwordHistoryLength>
-    </lifetime>
     <stringPolicy>
         <description>Testing string policy</description>
     </stringPolicy>
diff --git a/model/model-impl/src/test/resources/lens/ppolicy/password-policy-numeric.xml b/model/model-impl/src/test/resources/lens/ppolicy/password-policy-numeric.xml
index d2a6fc14eb4..3aa7cac7735 100644
--- a/model/model-impl/src/test/resources/lens/ppolicy/password-policy-numeric.xml
+++ b/model/model-impl/src/test/resources/lens/ppolicy/password-policy-numeric.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2017 Evolveum and contributors
+  ~ Copyright (c) 2010-2019 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -9,13 +9,6 @@
 <valuePolicy xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <name>Testing Numeric Password Policy</name>
-    <lifetime>
-        <expiration>999</expiration>
-        <warnBeforeExpiration>9</warnBeforeExpiration>
-        <lockAfterExpiration>0</lockAfterExpiration>
-        <minPasswordAge>0</minPasswordAge>
-        <passwordHistoryLength>0</passwordHistoryLength>
-    </lifetime>
     <stringPolicy>
         <limitations>
             <minLength>10</minLength>
diff --git a/model/model-impl/src/test/resources/lens/ppolicy/password-policy-tri.xml b/model/model-impl/src/test/resources/lens/ppolicy/password-policy-tri.xml
index 92c25a8f47f..ebbb4d09271 100644
--- a/model/model-impl/src/test/resources/lens/ppolicy/password-policy-tri.xml
+++ b/model/model-impl/src/test/resources/lens/ppolicy/password-policy-tri.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2015 Evolveum and contributors
+  ~ Copyright (c) 2015-2019 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -10,13 +10,6 @@
              xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
              xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3">
    <name>Testing tri policy</name>
-   <lifetime>
-      <expiration>999</expiration>
-      <warnBeforeExpiration>9</warnBeforeExpiration>
-      <lockAfterExpiration>0</lockAfterExpiration>
-      <minPasswordAge>0</minPasswordAge>
-      <passwordHistoryLength>0</passwordHistoryLength>
-   </lifetime>
    <stringPolicy>
       <description>Testing string policy</description>
       <limitations>
diff --git a/model/model-impl/src/test/resources/lens/ppolicy/password-policy-username.xml b/model/model-impl/src/test/resources/lens/ppolicy/password-policy-username.xml
index c0cc3f8ba1e..4943c20ed78 100644
--- a/model/model-impl/src/test/resources/lens/ppolicy/password-policy-username.xml
+++ b/model/model-impl/src/test/resources/lens/ppolicy/password-policy-username.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2017 Evolveum and contributors
+  ~ Copyright (c) 2017-2019 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
diff --git a/model/model-impl/src/test/resources/lens/ppolicy/value-policy-generate-empty.xml b/model/model-impl/src/test/resources/lens/ppolicy/value-policy-generate-empty.xml
index 313d9fed582..5ef276cad66 100644
--- a/model/model-impl/src/test/resources/lens/ppolicy/value-policy-generate-empty.xml
+++ b/model/model-impl/src/test/resources/lens/ppolicy/value-policy-generate-empty.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2017 Evolveum and contributors
+  ~ Copyright (c) 2010-2019 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -14,21 +14,6 @@
       <norm xmlns="http://prism.evolveum.com/xml/ns/public/types-3">numeric pin policy</norm>
    </name>
    <description>A policy useful for generating PIN.</description>
-   <c:lifetime xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-               xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
-               xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
-               xmlns:icfc="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-3"
-               xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
-               xmlns:cap="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-3"
-               xmlns:apti="http://midpoint.evolveum.com/xml/ns/public/common/api-types-3"
-               xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-               xmlns:enc="http://www.w3.org/2001/04/xmlenc#">
-      <c:expiration>999</c:expiration>
-      <c:warnBeforeExpiration>9</c:warnBeforeExpiration>
-      <c:lockAfterExpiration>0</c:lockAfterExpiration>
-      <c:minPasswordAge>0</c:minPasswordAge>
-      <c:passwordHistoryLength>0</c:passwordHistoryLength>
-   </c:lifetime>
    <c:stringPolicy xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
                    xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
                    xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
diff --git a/model/model-impl/src/test/resources/lens/ppolicy/value-policy-generate.xml b/model/model-impl/src/test/resources/lens/ppolicy/value-policy-generate.xml
index b19944e74a3..43cd82f7feb 100644
--- a/model/model-impl/src/test/resources/lens/ppolicy/value-policy-generate.xml
+++ b/model/model-impl/src/test/resources/lens/ppolicy/value-policy-generate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2017 Evolveum and contributors
+  ~ Copyright (c) 2010-2019 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -14,21 +14,6 @@
       <norm xmlns="http://prism.evolveum.com/xml/ns/public/types-3">numeric pin policy</norm>
    </name>
    <description>A policy useful for generating PIN.</description>
-   <c:lifetime xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-               xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
-               xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
-               xmlns:icfc="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-3"
-               xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
-               xmlns:cap="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-3"
-               xmlns:apti="http://midpoint.evolveum.com/xml/ns/public/common/api-types-3"
-               xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-               xmlns:enc="http://www.w3.org/2001/04/xmlenc#">
-      <c:expiration>999</c:expiration>
-      <c:warnBeforeExpiration>9</c:warnBeforeExpiration>
-      <c:lockAfterExpiration>0</c:lockAfterExpiration>
-      <c:minPasswordAge>0</c:minPasswordAge>
-      <c:passwordHistoryLength>0</c:passwordHistoryLength>
-   </c:lifetime>
    <c:stringPolicy xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
                    xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
                    xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
diff --git a/model/model-impl/src/test/resources/lens/ppolicy/value-policy-must-be-first.xml b/model/model-impl/src/test/resources/lens/ppolicy/value-policy-must-be-first.xml
index 06e66f00491..5de0ff0bd8b 100644
--- a/model/model-impl/src/test/resources/lens/ppolicy/value-policy-must-be-first.xml
+++ b/model/model-impl/src/test/resources/lens/ppolicy/value-policy-must-be-first.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
     <!--
-  ~ Copyright (c) 2010-2017 Evolveum and contributors
+  ~ Copyright (c) 2010-2019 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -11,13 +11,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <name>Numeric PIN Policy</name>
     <description>A policy useful for generating PIN.</description>
-    <lifetime>
-        <expiration>999</expiration>
-        <warnBeforeExpiration>9</warnBeforeExpiration>
-        <lockAfterExpiration>0</lockAfterExpiration>
-        <minPasswordAge>0</minPasswordAge>
-        <passwordHistoryLength>0</passwordHistoryLength>
-    </lifetime>
     <stringPolicy>
         <description>String validation policy</description>
         <limitations>
diff --git a/model/model-impl/src/test/resources/lens/ppolicy/value-policy-random-pin.xml b/model/model-impl/src/test/resources/lens/ppolicy/value-policy-random-pin.xml
index 76a64cb4dc1..ca0643f57b8 100644
--- a/model/model-impl/src/test/resources/lens/ppolicy/value-policy-random-pin.xml
+++ b/model/model-impl/src/test/resources/lens/ppolicy/value-policy-random-pin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ Copyright (c) 2010-2017 Evolveum and contributors
+  ~ Copyright (c) 2010-2019 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -15,21 +15,6 @@
       <norm xmlns="http://prism.evolveum.com/xml/ns/public/types-3">numeric pin policy</norm>
    </name>
    <description>A policy useful for generating PIN.</description>
-   <c:lifetime xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-               xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
-               xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
-               xmlns:icfc="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/connector-schema-3"
-               xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
-               xmlns:cap="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-3"
-               xmlns:apti="http://midpoint.evolveum.com/xml/ns/public/common/api-types-3"
-               xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-               xmlns:enc="http://www.w3.org/2001/04/xmlenc#">
-      <c:expiration>999</c:expiration>
-      <c:warnBeforeExpiration>9</c:warnBeforeExpiration>
-      <c:lockAfterExpiration>0</c:lockAfterExpiration>
-      <c:minPasswordAge>0</c:minPasswordAge>
-      <c:passwordHistoryLength>0</c:passwordHistoryLength>
-   </c:lifetime>
    <c:stringPolicy xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
                    xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
                    xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"