diff --git a/bin/addons/base/__openerp__.py b/bin/addons/base/__openerp__.py
index 531c66909ad..827ac3263ae 100644
--- a/bin/addons/base/__openerp__.py
+++ b/bin/addons/base/__openerp__.py
@@ -66,7 +66,15 @@
         'security/ir.model.access.csv'
 
     ],
-    'demo_xml': ['base_demo.xml', 'res/partner/partner_demo.xml', 'res/partner/crm_demo.xml','test/base_test.xml'],
+    'demo_xml': [
+        'base_demo.xml',
+        'res/partner/partner_demo.xml',
+        'res/partner/crm_demo.xml',
+    ],
+    'test': [
+        'test/base_test.xml',
+        'test/test_context.xml',
+    ],
     'installable': True,
     'active': True,
     'certificate': '0076807797149',
diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index ca211b4a6d5..3bc6e4d6322 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1293,7 +1293,18 @@
             <field name="currency_id" ref="INR"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
+
+        <record id="rateINR2001" model="res.currency.rate">
+            <field name="rate">0.631</field>
+            <field name="currency_id" ref="INR"/>
+            <field name="name">2001-01-01</field>
+        </record>
+        <record id="rateINR2002" model="res.currency.rate">
+            <field name="rate">0.632</field>
+            <field name="currency_id" ref="INR"/>
+            <field name="name">2002-01-01</field>
+        </record>
+
         <record id="AUD" model="res.currency">
             <field name="name">AUD</field>
             <field name="code">AUD</field>
diff --git a/bin/addons/base/test/test_context.xml b/bin/addons/base/test/test_context.xml
new file mode 100644
index 00000000000..f9a6f2055a5
--- /dev/null
+++ b/bin/addons/base/test/test_context.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+   	<!-- Test context attribute for unit tests -->
+    <data context="{'date': '2001-06-01'}">
+        <assert 
+        	model="res.currency"
+        	id="INR"
+        	string="Indian rupee rate in 2001">
+        	<!-- date specified in data element's context -->
+            <test expr="str(rate)">0.631</test>
+        </assert>
+        <assert 
+        	model="res.currency"
+        	id="INR"
+        	string="Indian rupee rate in 2002"
+        	context="{'date': '2002-06-01'}">
+            <test expr="str(rate)">0.632</test>
+        </assert>
+    </data>
+</openerp>
diff --git a/bin/import_xml.rng b/bin/import_xml.rng
index e139238acfe..3a698f4a897 100644
--- a/bin/import_xml.rng
+++ b/bin/import_xml.rng
@@ -32,6 +32,7 @@
             <rng:attribute name="name" />
             <rng:optional><rng:attribute name="id" /></rng:optional>
             <rng:optional><rng:attribute name="eval" /></rng:optional>
+            <rng:optional><rng:attribute name="context" /></rng:optional>
             <rng:choice>
                 <rng:empty />
                 <rng:oneOrMore>
@@ -51,6 +52,7 @@
             <rng:optional><rng:attribute name="count" /></rng:optional>
             <rng:optional><rng:attribute name="string" /></rng:optional>
             <rng:optional><rng:attribute name="id" /></rng:optional>
+            <rng:optional><rng:attribute name="context" /></rng:optional>
             <rng:optional><rng:attribute name="severity" /></rng:optional>
             <rng:zeroOrMore>
                 <rng:element name="test">
@@ -70,6 +72,7 @@
             <rng:optional><rng:attribute name="ref" /></rng:optional>
             <rng:attribute name="action"/>
             <rng:optional><rng:attribute name="uid"/></rng:optional>
+            <rng:optional><rng:attribute name="context" /></rng:optional>
             <rng:choice>
                 <rng:empty/>
                 <rng:ref name="value"/>
@@ -205,6 +208,7 @@
     <rng:define name="data">
         <rng:element name="data">
             <rng:optional><rng:attribute name="noupdate" /></rng:optional>
+            <rng:optional><rng:attribute name="context" /></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:text/>