diff --git a/source/dub/dependencyresolver.d b/source/dub/dependencyresolver.d
index 534f839..5a1b704 100644
--- a/source/dub/dependencyresolver.d
+++ b/source/dub/dependencyresolver.d
@@ -29,6 +29,32 @@
 	can be defined in terms of a version range.
 */
 class DependencyResolver(CONFIGS, CONFIG) {
+	/// Maximum number of loop rounds to do
+	protected ulong loop_limit;
+
+	/**
+	 * Construct an instance of this class
+	 *
+	 * Params:
+	 *	 limit = Maximum number of loop rounds to do
+	 */
+	public this (ulong limit) inout scope @safe pure nothrow @nogc
+	{
+		this.loop_limit = limit;
+	}
+
+	/// Compatibility overload
+	deprecated("Use the overload that accepts a `ulong limit` argument")
+	public this () scope @safe
+	{
+		// Leave the possibility to opt-out from the loop limit
+		import std.process : environment;
+		if (environment.get("DUB_NO_RESOLVE_LIMIT") !is null)
+			this(ulong.max);
+		else
+			this(1_000_000);
+	}
+
 	/** Encapsulates a list of outgoing edges in the dependency graph.
 
 		A value of this type represents a single dependency with multiple
@@ -75,17 +101,13 @@
 
 	CONFIG[string] resolve(TreeNode root, bool throw_on_failure = true)
 	{
-		// Leave the possibility to opt-out from the loop limit
-		import std.process : environment;
-		bool no_loop_limit = environment.get("DUB_NO_RESOLVE_LIMIT") !is null;
-
 		auto rootbase = root.pack.basePackageName;
 
 		// build up the dependency graph, eliminating as many configurations/
 		// versions as possible
 		ResolveContext context;
 		context.configs[rootbase] = [ResolveConfig(root.config, true)];
-		ulong loop_counter = no_loop_limit ? ulong.max : 1_000_000;
+		ulong loop_counter = this.loop_limit;
 		constrain(root, context, loop_counter);
 
 		// remove any non-default optional dependencies
@@ -358,7 +380,7 @@
 
 	static class TestResolver : DependencyResolver!(IntConfigs, IntConfig) {
 		private TreeNodes[][string] m_children;
-		this(TreeNodes[][string] children) { m_children = children; }
+		this(TreeNodes[][string] children) { super(ulong.max); m_children = children; }
 		protected override IntConfig[] getAllConfigs(string pack) {
 			auto ret = appender!(IntConfig[]);
 			foreach (p; m_children.byKey) {
diff --git a/source/dub/dub.d b/source/dub/dub.d
index 72d6df7..3b0f372 100644
--- a/source/dub/dub.d
+++ b/source/dub/dub.d
@@ -1457,6 +1457,11 @@
 
 	this(Dub dub, UpgradeOptions options, Package root, SelectedVersions selected_versions)
 	{
+		if (environment.get("DUB_NO_RESOLVE_LIMIT") !is null)
+			super(ulong.max);
+		else
+		    super(1_000_000);
+
 		m_dub = dub;
 		m_options = options;
 		m_rootPackage = root;