diff --git a/ECMJobRunner.Infrastructure/Data/JobRunnerDbContext.cs b/ECMJobRunner.Infrastructure/Data/JobRunnerDbContext.cs
index 06cbc40..21de427 100644
--- a/ECMJobRunner.Infrastructure/Data/JobRunnerDbContext.cs
+++ b/ECMJobRunner.Infrastructure/Data/JobRunnerDbContext.cs
@@ -1,5 +1,6 @@
 #if NET48
 using System.Data.Entity;
+using System.Data.Common;
 #else
 using Microsoft.EntityFrameworkCore;
 #endif
@@ -41,6 +42,13 @@ namespace ECMJobRunner.Infrastructure.Data
         public JobRunnerDbContext(string connectionString) : base(connectionString)
         {
         }
+
+        /// <summary>
+        /// Constructor with DbConnection for Entity Framework 6 (used for InMemory testing with Effort)
+        /// </summary>
+        public JobRunnerDbContext(DbConnection connection) : base(connection, contextOwnsConnection: true)
+        {
+        }
 #else
         /// <summary>
         /// Constructor for Entity Framework Core (.NET 8)
diff --git a/ECMJobRunner.Infrastructure/DependencyExtension.cs b/ECMJobRunner.Infrastructure/DependencyExtension.cs
index 2a432f3..7eed1f6 100644
--- a/ECMJobRunner.Infrastructure/DependencyExtension.cs
+++ b/ECMJobRunner.Infrastructure/DependencyExtension.cs
@@ -45,5 +45,59 @@ namespace ECMJobRunner.Infrastructure
 
             return services;
         }
+
+#if NET48
+        /// <summary>
+        /// Add Infrastructure services with InMemory database for testing (.NET Framework 4.8 - uses Effort)
+        /// </summary>
+        /// <param name="services">Service collection</param>
+        /// <returns>Service collection for chaining</returns>
+        public static IServiceCollection AddInfrastructureInMemory(this IServiceCollection services)
+        {
+            // Register DbContext as scoped with Effort InMemory connection
+            services.AddScoped(provider =>
+            {
+                var connection = Effort.DbConnectionFactory.CreateTransient();
+                return new JobRunnerDbContext(connection);
+            });
+
+            // Register AutoMapper
+            services.AddAutoMapper(typeof(DependencyExtension).Assembly);
+
+            // Register repositories as scoped (same lifetime as DbContext)
+            services.AddScoped(typeof(IRepository<>), typeof(Repository<>));
+            services.AddScoped<ICfgProfileRepository, CfgProfileRepository>();
+            services.AddScoped<IProfileSqlJobRepository, ProfileSqlJobRepository>();
+            services.AddScoped<IProfileHistoryRepository, ProfileHistoryRepository>();
+
+            return services;
+        }
+#else
+        /// <summary>
+        /// Add Infrastructure services with InMemory database for testing (.NET 8 - uses EF Core InMemory)
+        /// </summary>
+        /// <param name="services">Service collection</param>
+        /// <param name="databaseName">Optional database name (default: random GUID)</param>
+        /// <returns>Service collection for chaining</returns>
+        public static IServiceCollection AddInfrastructureInMemory(this IServiceCollection services, string? databaseName = null)
+        {
+            var dbName = databaseName ?? $"TestDb_{System.Guid.NewGuid()}";
+            
+            // Register DbContext as scoped with InMemory database
+            services.AddDbContext<JobRunnerDbContext>(options =>
+                options.UseInMemoryDatabase(dbName));
+
+            // Register AutoMapper
+            services.AddAutoMapper(typeof(DependencyExtension).Assembly);
+
+            // Register repositories as scoped (same lifetime as DbContext)
+            services.AddScoped(typeof(IRepository<>), typeof(Repository<>));
+            services.AddScoped<ICfgProfileRepository, CfgProfileRepository>();
+            services.AddScoped<IProfileSqlJobRepository, ProfileSqlJobRepository>();
+            services.AddScoped<IProfileHistoryRepository, ProfileHistoryRepository>();
+
+            return services;
+        }
+#endif
     }
 }
diff --git a/ECMJobRunner.Infrastructure/Mapping/EntityMappingProfile.cs b/ECMJobRunner.Infrastructure/Mapping/EntityMappingProfile.cs
new file mode 100644
index 0000000..acb1e05
--- /dev/null
+++ b/ECMJobRunner.Infrastructure/Mapping/EntityMappingProfile.cs
@@ -0,0 +1,22 @@
+using AutoMapper;
+using ECMJobRunner.Domain.Entities;
+
+namespace ECMJobRunner.Infrastructure.Mapping
+{
+    /// <summary>
+    /// AutoMapper profile for entity mappings
+    /// </summary>
+    public class EntityMappingProfile : Profile
+    {
+        /// <summary>
+        /// Constructor configuring AutoMapper mappings for all entities
+        /// </summary>
+        public EntityMappingProfile()
+        {
+            // Note: object -> Entity mappings are intentionally removed
+            // AutoMapper cannot map from object type due to reflection limitations
+            // Callers should use explicit DTO types and create specific mappings
+            // Example: CreateMap<YourDto, CfgProfile>() in your own AutoMapper profile
+        }
+    }
+}